summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ec
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/ec')
-rw-r--r--src/lib/libcrypto/ec/ec_ameth.c3
-rw-r--r--src/lib/libcrypto/ec/ec_asn1.c3
-rw-r--r--src/lib/libcrypto/ec/ec_mult.c11
-rw-r--r--src/lib/libcrypto/ec/eck_prn.c3
-rw-r--r--src/lib/libcrypto/ec/ecp_nistp224.c9
-rw-r--r--src/lib/libcrypto/ec/ecp_nistp256.c9
-rw-r--r--src/lib/libcrypto/ec/ecp_nistp521.c9
7 files changed, 15 insertions, 32 deletions
diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c
index b41879c431..ec074329f2 100644
--- a/src/lib/libcrypto/ec/ec_ameth.c
+++ b/src/lib/libcrypto/ec/ec_ameth.c
@@ -492,8 +492,7 @@ err:
492 BN_free(order); 492 BN_free(order);
493 if (ctx) 493 if (ctx)
494 BN_CTX_free(ctx); 494 BN_CTX_free(ctx);
495 if (buffer != NULL) 495 free(buffer);
496 free(buffer);
497 return (ret); 496 return (ret);
498} 497}
499 498
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index 2409cd0886..342db2a992 100644
--- a/src/lib/libcrypto/ec/ec_asn1.c
+++ b/src/lib/libcrypto/ec/ec_asn1.c
@@ -805,8 +805,7 @@ ec_asn1_parameters2group(const ECPARAMETERS * params)
805 } 805 }
806 /* extract seed (optional) */ 806 /* extract seed (optional) */
807 if (params->curve->seed != NULL) { 807 if (params->curve->seed != NULL) {
808 if (ret->seed != NULL) 808 free(ret->seed);
809 free(ret->seed);
810 if (!(ret->seed = malloc(params->curve->seed->length))) { 809 if (!(ret->seed = malloc(params->curve->seed->length))) {
811 ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, 810 ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP,
812 ERR_R_MALLOC_FAILURE); 811 ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libcrypto/ec/ec_mult.c b/src/lib/libcrypto/ec/ec_mult.c
index 0fd0cab2f1..8894a8f907 100644
--- a/src/lib/libcrypto/ec/ec_mult.c
+++ b/src/lib/libcrypto/ec/ec_mult.c
@@ -683,10 +683,8 @@ err:
683 BN_CTX_free(new_ctx); 683 BN_CTX_free(new_ctx);
684 if (tmp != NULL) 684 if (tmp != NULL)
685 EC_POINT_free(tmp); 685 EC_POINT_free(tmp);
686 if (wsize != NULL) 686 free(wsize);
687 free(wsize); 687 free(wNAF_len);
688 if (wNAF_len != NULL)
689 free(wNAF_len);
690 if (wNAF != NULL) { 688 if (wNAF != NULL) {
691 signed char **w; 689 signed char **w;
692 690
@@ -698,12 +696,9 @@ err:
698 if (val != NULL) { 696 if (val != NULL) {
699 for (v = val; *v != NULL; v++) 697 for (v = val; *v != NULL; v++)
700 EC_POINT_clear_free(*v); 698 EC_POINT_clear_free(*v);
701
702 free(val); 699 free(val);
703 } 700 }
704 if (val_sub != NULL) { 701 free(val_sub);
705 free(val_sub);
706 }
707 return ret; 702 return ret;
708} 703}
709 704
diff --git a/src/lib/libcrypto/ec/eck_prn.c b/src/lib/libcrypto/ec/eck_prn.c
index 3f2973e5b6..60b00fddb3 100644
--- a/src/lib/libcrypto/ec/eck_prn.c
+++ b/src/lib/libcrypto/ec/eck_prn.c
@@ -325,8 +325,7 @@ err:
325 BN_free(cofactor); 325 BN_free(cofactor);
326 if (ctx) 326 if (ctx)
327 BN_CTX_free(ctx); 327 BN_CTX_free(ctx);
328 if (buffer != NULL) 328 free(buffer);
329 free(buffer);
330 return (ret); 329 return (ret);
331} 330}
332 331
diff --git a/src/lib/libcrypto/ec/ecp_nistp224.c b/src/lib/libcrypto/ec/ecp_nistp224.c
index 6e9b9fac3c..afe25853e6 100644
--- a/src/lib/libcrypto/ec/ecp_nistp224.c
+++ b/src/lib/libcrypto/ec/ecp_nistp224.c
@@ -1546,12 +1546,9 @@ err:
1546 EC_POINT_free(generator); 1546 EC_POINT_free(generator);
1547 if (new_ctx != NULL) 1547 if (new_ctx != NULL)
1548 BN_CTX_free(new_ctx); 1548 BN_CTX_free(new_ctx);
1549 if (secrets != NULL) 1549 free(secrets);
1550 free(secrets); 1550 free(pre_comp);
1551 if (pre_comp != NULL) 1551 free(tmp_felems);
1552 free(pre_comp);
1553 if (tmp_felems != NULL)
1554 free(tmp_felems);
1555 return ret; 1552 return ret;
1556} 1553}
1557 1554
diff --git a/src/lib/libcrypto/ec/ecp_nistp256.c b/src/lib/libcrypto/ec/ecp_nistp256.c
index b2398e106c..7fe7be27de 100644
--- a/src/lib/libcrypto/ec/ecp_nistp256.c
+++ b/src/lib/libcrypto/ec/ecp_nistp256.c
@@ -2101,12 +2101,9 @@ err:
2101 EC_POINT_free(generator); 2101 EC_POINT_free(generator);
2102 if (new_ctx != NULL) 2102 if (new_ctx != NULL)
2103 BN_CTX_free(new_ctx); 2103 BN_CTX_free(new_ctx);
2104 if (secrets != NULL) 2104 free(secrets);
2105 free(secrets); 2105 free(pre_comp);
2106 if (pre_comp != NULL) 2106 free(tmp_smallfelems);
2107 free(pre_comp);
2108 if (tmp_smallfelems != NULL)
2109 free(tmp_smallfelems);
2110 return ret; 2107 return ret;
2111} 2108}
2112 2109
diff --git a/src/lib/libcrypto/ec/ecp_nistp521.c b/src/lib/libcrypto/ec/ecp_nistp521.c
index 083e017cdc..5d5a747ee8 100644
--- a/src/lib/libcrypto/ec/ecp_nistp521.c
+++ b/src/lib/libcrypto/ec/ecp_nistp521.c
@@ -1988,12 +1988,9 @@ err:
1988 EC_POINT_free(generator); 1988 EC_POINT_free(generator);
1989 if (new_ctx != NULL) 1989 if (new_ctx != NULL)
1990 BN_CTX_free(new_ctx); 1990 BN_CTX_free(new_ctx);
1991 if (secrets != NULL) 1991 free(secrets);
1992 free(secrets); 1992 free(pre_comp);
1993 if (pre_comp != NULL) 1993 free(tmp_felems);
1994 free(pre_comp);
1995 if (tmp_felems != NULL)
1996 free(tmp_felems);
1997 return ret; 1994 return ret;
1998} 1995}
1999 1996