diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 19:59:47 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 20:57:54 -0400 |
| commit | c4962abc9b5940cdd3bed920b19334fd269df31b (patch) | |
| tree | 59c80b695ba170e37a9be4edfc2770e7b50ebea1 /openssl/crypto/ec/ec_ameth.c | |
| parent | c70e12e95b569baa2274eacfbac43dd2df40c2ae (diff) | |
| download | vcxsrv-c4962abc9b5940cdd3bed920b19334fd269df31b.tar.gz vcxsrv-c4962abc9b5940cdd3bed920b19334fd269df31b.tar.bz2 vcxsrv-c4962abc9b5940cdd3bed920b19334fd269df31b.zip | |
Update openssl to version openssl-1.0.1j
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/crypto/ec/ec_ameth.c')
| -rw-r--r-- | openssl/crypto/ec/ec_ameth.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/openssl/crypto/ec/ec_ameth.c b/openssl/crypto/ec/ec_ameth.c index f715a238a..11283769b 100644 --- a/openssl/crypto/ec/ec_ameth.c +++ b/openssl/crypto/ec/ec_ameth.c @@ -453,14 +453,16 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, int ktype) if (ktype > 0) { public_key = EC_KEY_get0_public_key(x); - if ((pub_key = EC_POINT_point2bn(group, public_key, - EC_KEY_get_conv_form(x), NULL, ctx)) == NULL) + if (public_key != NULL) { - reason = ERR_R_EC_LIB; - goto err; - } - if (pub_key) + if ((pub_key = EC_POINT_point2bn(group, public_key, + EC_KEY_get_conv_form(x), NULL, ctx)) == NULL) + { + reason = ERR_R_EC_LIB; + goto err; + } buf_len = (size_t)BN_num_bytes(pub_key); + } } if (ktype == 2) |