diff options
| author | jkim <jkim@FreeBSD.org> | 2014-06-06 20:59:29 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-06-06 20:59:29 +0000 |
| commit | d4a5f67323e640990da5aa727b2e6da35d2157f3 (patch) | |
| tree | a707d3fdb02faa3d4423773ae7b606febaa5e786 /crypto/ec | |
| parent | c16e01227ffa34203d2f43372183c566db7fad83 (diff) | |
| download | FreeBSD-src-d4a5f67323e640990da5aa727b2e6da35d2157f3.zip FreeBSD-src-d4a5f67323e640990da5aa727b2e6da35d2157f3.tar.gz | |
Import OpenSSL 1.0.1h.
Approved by: so (delphij)
Diffstat (limited to 'crypto/ec')
| -rw-r--r-- | crypto/ec/ec_ameth.c | 1 | ||||
| -rw-r--r-- | crypto/ec/ec_asn1.c | 7 | ||||
| -rw-r--r-- | crypto/ec/ec_lcl.h | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index 0ce4524..f715a23 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -352,6 +352,7 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) EC_KEY_set_enc_flags(ec_key, old_flags); OPENSSL_free(ep); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); + return 0; } /* restore old encoding flags */ EC_KEY_set_enc_flags(ec_key, old_flags); diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c index 145807b..e94f34e 100644 --- a/crypto/ec/ec_asn1.c +++ b/crypto/ec/ec_asn1.c @@ -1435,8 +1435,11 @@ int i2o_ECPublicKey(EC_KEY *a, unsigned char **out) *out, buf_len, NULL)) { ECerr(EC_F_I2O_ECPUBLICKEY, ERR_R_EC_LIB); - OPENSSL_free(*out); - *out = NULL; + if (new_buffer) + { + OPENSSL_free(*out); + *out = NULL; + } return 0; } if (!new_buffer) diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h index da7967d..b0d48b6 100644 --- a/crypto/ec/ec_lcl.h +++ b/crypto/ec/ec_lcl.h @@ -404,7 +404,7 @@ int ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, int ec_GF2m_precompute_mult(EC_GROUP *group, BN_CTX *ctx); int ec_GF2m_have_precompute_mult(const EC_GROUP *group); -#ifndef OPENSSL_EC_NISTP_64_GCC_128 +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 /* method functions in ecp_nistp224.c */ int ec_GFp_nistp224_group_init(EC_GROUP *group); int ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *n, BN_CTX *); |
