summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ec/ec_ameth.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/ec/ec_ameth.c')
-rw-r--r--src/lib/libcrypto/ec/ec_ameth.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c
index 21390aabd4..30f29ef545 100644
--- a/src/lib/libcrypto/ec/ec_ameth.c
+++ b/src/lib/libcrypto/ec/ec_ameth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_ameth.c,v 1.21 2018/07/10 22:06:14 tb Exp $ */ 1/* $OpenBSD: ec_ameth.c,v 1.22 2018/07/15 05:38:48 jsg Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -126,7 +126,7 @@ eckey_pub_encode(X509_PUBKEY * pk, const EVP_PKEY * pkey)
126 if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_EC), 126 if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_EC),
127 ptype, pval, penc, penclen)) 127 ptype, pval, penc, penclen))
128 return 1; 128 return 1;
129 err: 129err:
130 if (ptype == V_ASN1_OBJECT) 130 if (ptype == V_ASN1_OBJECT)
131 ASN1_OBJECT_free(pval); 131 ASN1_OBJECT_free(pval);
132 else 132 else
@@ -177,7 +177,7 @@ eckey_type2param(int ptype, const void *pval)
177 177
178 return eckey; 178 return eckey;
179 179
180 ecerr: 180ecerr:
181 if (eckey) 181 if (eckey)
182 EC_KEY_free(eckey); 182 EC_KEY_free(eckey);
183 return NULL; 183 return NULL;
@@ -210,7 +210,7 @@ eckey_pub_decode(EVP_PKEY * pkey, X509_PUBKEY * pubkey)
210 EVP_PKEY_assign_EC_KEY(pkey, eckey); 210 EVP_PKEY_assign_EC_KEY(pkey, eckey);
211 return 1; 211 return 1;
212 212
213 ecerr: 213ecerr:
214 if (eckey) 214 if (eckey)
215 EC_KEY_free(eckey); 215 EC_KEY_free(eckey);
216 return 0; 216 return 0;
@@ -290,9 +290,9 @@ eckey_priv_decode(EVP_PKEY * pkey, PKCS8_PRIV_KEY_INFO * p8)
290 EVP_PKEY_assign_EC_KEY(pkey, eckey); 290 EVP_PKEY_assign_EC_KEY(pkey, eckey);
291 return 1; 291 return 1;
292 292
293 ecliberr: 293ecliberr:
294 ECerror(ERR_R_EC_LIB); 294 ECerror(ERR_R_EC_LIB);
295 ecerr: 295ecerr:
296 if (eckey) 296 if (eckey)
297 EC_KEY_free(eckey); 297 EC_KEY_free(eckey);
298 return 0; 298 return 0;
@@ -483,7 +483,7 @@ do_EC_KEY_print(BIO * bp, const EC_KEY * x, int off, int ktype)
483 if (!ECPKParameters_print(bp, group, off)) 483 if (!ECPKParameters_print(bp, group, off))
484 goto err; 484 goto err;
485 ret = 1; 485 ret = 1;
486 err: 486err:
487 if (!ret) 487 if (!ret)
488 ECerror(reason); 488 ECerror(reason);
489 BN_free(pub_key); 489 BN_free(pub_key);