summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortedu <>2014-04-20 12:30:41 +0000
committertedu <>2014-04-20 12:30:41 +0000
commit4b4a5d4b04e0ebd28c425210967942e4fa5d834c (patch)
tree9053a073823ed14d9cd0199b1b376d3282e793bb
parentba5ffe465c7b412a5c5361b3ef1897cccc0543a3 (diff)
downloadopenbsd-4b4a5d4b04e0ebd28c425210967942e4fa5d834c.tar.gz
openbsd-4b4a5d4b04e0ebd28c425210967942e4fa5d834c.tar.bz2
openbsd-4b4a5d4b04e0ebd28c425210967942e4fa5d834c.zip
return after error instead of plowing ahead. noticed by mancha1 at zoho
-rw-r--r--src/lib/libcrypto/ec/ec_ameth.c1
-rw-r--r--src/lib/libssl/src/crypto/ec/ec_ameth.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c
index 6331903141..79dd11083e 100644
--- a/src/lib/libcrypto/ec/ec_ameth.c
+++ b/src/lib/libcrypto/ec/ec_ameth.c
@@ -352,6 +352,7 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
352 EC_KEY_set_enc_flags(ec_key, old_flags); 352 EC_KEY_set_enc_flags(ec_key, old_flags);
353 free(ep); 353 free(ep);
354 ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); 354 ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB);
355 return 0;
355 } 356 }
356 /* restore old encoding flags */ 357 /* restore old encoding flags */
357 EC_KEY_set_enc_flags(ec_key, old_flags); 358 EC_KEY_set_enc_flags(ec_key, old_flags);
diff --git a/src/lib/libssl/src/crypto/ec/ec_ameth.c b/src/lib/libssl/src/crypto/ec/ec_ameth.c
index 6331903141..79dd11083e 100644
--- a/src/lib/libssl/src/crypto/ec/ec_ameth.c
+++ b/src/lib/libssl/src/crypto/ec/ec_ameth.c
@@ -352,6 +352,7 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
352 EC_KEY_set_enc_flags(ec_key, old_flags); 352 EC_KEY_set_enc_flags(ec_key, old_flags);
353 free(ep); 353 free(ep);
354 ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); 354 ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB);
355 return 0;
355 } 356 }
356 /* restore old encoding flags */ 357 /* restore old encoding flags */
357 EC_KEY_set_enc_flags(ec_key, old_flags); 358 EC_KEY_set_enc_flags(ec_key, old_flags);