diff options
Diffstat (limited to 'src/lib/libcrypto/ec/ec_lib.c')
| -rw-r--r-- | src/lib/libcrypto/ec/ec_lib.c | 40 | 
1 files changed, 20 insertions, 20 deletions
| diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c index e2c4741b5b..546fd08e38 100644 --- a/src/lib/libcrypto/ec/ec_lib.c +++ b/src/lib/libcrypto/ec/ec_lib.c | |||
| @@ -88,7 +88,7 @@ EC_GROUP *EC_GROUP_new(const EC_METHOD *meth) | |||
| 88 | return NULL; | 88 | return NULL; | 
| 89 | } | 89 | } | 
| 90 | 90 | ||
| 91 | ret = OPENSSL_malloc(sizeof *ret); | 91 | ret = malloc(sizeof *ret); | 
| 92 | if (ret == NULL) | 92 | if (ret == NULL) | 
| 93 | { | 93 | { | 
| 94 | ECerr(EC_F_EC_GROUP_NEW, ERR_R_MALLOC_FAILURE); | 94 | ECerr(EC_F_EC_GROUP_NEW, ERR_R_MALLOC_FAILURE); | 
| @@ -112,7 +112,7 @@ EC_GROUP *EC_GROUP_new(const EC_METHOD *meth) | |||
| 112 | 112 | ||
| 113 | if (!meth->group_init(ret)) | 113 | if (!meth->group_init(ret)) | 
| 114 | { | 114 | { | 
| 115 | OPENSSL_free(ret); | 115 | free(ret); | 
| 116 | return NULL; | 116 | return NULL; | 
| 117 | } | 117 | } | 
| 118 | 118 | ||
| @@ -135,9 +135,9 @@ void EC_GROUP_free(EC_GROUP *group) | |||
| 135 | BN_free(&group->cofactor); | 135 | BN_free(&group->cofactor); | 
| 136 | 136 | ||
| 137 | if (group->seed) | 137 | if (group->seed) | 
| 138 | OPENSSL_free(group->seed); | 138 | free(group->seed); | 
| 139 | 139 | ||
| 140 | OPENSSL_free(group); | 140 | free(group); | 
| 141 | } | 141 | } | 
| 142 | 142 | ||
| 143 | 143 | ||
| @@ -160,11 +160,11 @@ void EC_GROUP_clear_free(EC_GROUP *group) | |||
| 160 | if (group->seed) | 160 | if (group->seed) | 
| 161 | { | 161 | { | 
| 162 | OPENSSL_cleanse(group->seed, group->seed_len); | 162 | OPENSSL_cleanse(group->seed, group->seed_len); | 
| 163 | OPENSSL_free(group->seed); | 163 | free(group->seed); | 
| 164 | } | 164 | } | 
| 165 | 165 | ||
| 166 | OPENSSL_cleanse(group, sizeof *group); | 166 | OPENSSL_cleanse(group, sizeof *group); | 
| 167 | OPENSSL_free(group); | 167 | free(group); | 
| 168 | } | 168 | } | 
| 169 | 169 | ||
| 170 | 170 | ||
| @@ -226,8 +226,8 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src) | |||
| 226 | if (src->seed) | 226 | if (src->seed) | 
| 227 | { | 227 | { | 
| 228 | if (dest->seed) | 228 | if (dest->seed) | 
| 229 | OPENSSL_free(dest->seed); | 229 | free(dest->seed); | 
| 230 | dest->seed = OPENSSL_malloc(src->seed_len); | 230 | dest->seed = malloc(src->seed_len); | 
| 231 | if (dest->seed == NULL) | 231 | if (dest->seed == NULL) | 
| 232 | return 0; | 232 | return 0; | 
| 233 | if (!memcpy(dest->seed, src->seed, src->seed_len)) | 233 | if (!memcpy(dest->seed, src->seed, src->seed_len)) | 
| @@ -237,7 +237,7 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src) | |||
| 237 | else | 237 | else | 
| 238 | { | 238 | { | 
| 239 | if (dest->seed) | 239 | if (dest->seed) | 
| 240 | OPENSSL_free(dest->seed); | 240 | free(dest->seed); | 
| 241 | dest->seed = NULL; | 241 | dest->seed = NULL; | 
| 242 | dest->seed_len = 0; | 242 | dest->seed_len = 0; | 
| 243 | } | 243 | } | 
| @@ -375,7 +375,7 @@ size_t EC_GROUP_set_seed(EC_GROUP *group, const unsigned char *p, size_t len) | |||
| 375 | { | 375 | { | 
| 376 | if (group->seed) | 376 | if (group->seed) | 
| 377 | { | 377 | { | 
| 378 | OPENSSL_free(group->seed); | 378 | free(group->seed); | 
| 379 | group->seed = NULL; | 379 | group->seed = NULL; | 
| 380 | group->seed_len = 0; | 380 | group->seed_len = 0; | 
| 381 | } | 381 | } | 
| @@ -383,7 +383,7 @@ size_t EC_GROUP_set_seed(EC_GROUP *group, const unsigned char *p, size_t len) | |||
| 383 | if (!len || !p) | 383 | if (!len || !p) | 
| 384 | return 1; | 384 | return 1; | 
| 385 | 385 | ||
| 386 | if ((group->seed = OPENSSL_malloc(len)) == NULL) | 386 | if ((group->seed = malloc(len)) == NULL) | 
| 387 | return 0; | 387 | return 0; | 
| 388 | memcpy(group->seed, p, len); | 388 | memcpy(group->seed, p, len); | 
| 389 | group->seed_len = len; | 389 | group->seed_len = len; | 
| @@ -567,7 +567,7 @@ int EC_EX_DATA_set_data(EC_EXTRA_DATA **ex_data, void *data, | |||
| 567 | /* no explicit entry needed */ | 567 | /* no explicit entry needed */ | 
| 568 | return 1; | 568 | return 1; | 
| 569 | 569 | ||
| 570 | d = OPENSSL_malloc(sizeof *d); | 570 | d = malloc(sizeof *d); | 
| 571 | if (d == NULL) | 571 | if (d == NULL) | 
| 572 | return 0; | 572 | return 0; | 
| 573 | 573 | ||
| @@ -613,7 +613,7 @@ void EC_EX_DATA_free_data(EC_EXTRA_DATA **ex_data, | |||
| 613 | EC_EXTRA_DATA *next = (*p)->next; | 613 | EC_EXTRA_DATA *next = (*p)->next; | 
| 614 | 614 | ||
| 615 | (*p)->free_func((*p)->data); | 615 | (*p)->free_func((*p)->data); | 
| 616 | OPENSSL_free(*p); | 616 | free(*p); | 
| 617 | 617 | ||
| 618 | *p = next; | 618 | *p = next; | 
| 619 | return; | 619 | return; | 
| @@ -637,7 +637,7 @@ void EC_EX_DATA_clear_free_data(EC_EXTRA_DATA **ex_data, | |||
| 637 | EC_EXTRA_DATA *next = (*p)->next; | 637 | EC_EXTRA_DATA *next = (*p)->next; | 
| 638 | 638 | ||
| 639 | (*p)->clear_free_func((*p)->data); | 639 | (*p)->clear_free_func((*p)->data); | 
| 640 | OPENSSL_free(*p); | 640 | free(*p); | 
| 641 | 641 | ||
| 642 | *p = next; | 642 | *p = next; | 
| 643 | return; | 643 | return; | 
| @@ -659,7 +659,7 @@ void EC_EX_DATA_free_all_data(EC_EXTRA_DATA **ex_data) | |||
| 659 | EC_EXTRA_DATA *next = d->next; | 659 | EC_EXTRA_DATA *next = d->next; | 
| 660 | 660 | ||
| 661 | d->free_func(d->data); | 661 | d->free_func(d->data); | 
| 662 | OPENSSL_free(d); | 662 | free(d); | 
| 663 | 663 | ||
| 664 | d = next; | 664 | d = next; | 
| 665 | } | 665 | } | 
| @@ -680,7 +680,7 @@ void EC_EX_DATA_clear_free_all_data(EC_EXTRA_DATA **ex_data) | |||
| 680 | EC_EXTRA_DATA *next = d->next; | 680 | EC_EXTRA_DATA *next = d->next; | 
| 681 | 681 | ||
| 682 | d->clear_free_func(d->data); | 682 | d->clear_free_func(d->data); | 
| 683 | OPENSSL_free(d); | 683 | free(d); | 
| 684 | 684 | ||
| 685 | d = next; | 685 | d = next; | 
| 686 | } | 686 | } | 
| @@ -705,7 +705,7 @@ EC_POINT *EC_POINT_new(const EC_GROUP *group) | |||
| 705 | return NULL; | 705 | return NULL; | 
| 706 | } | 706 | } | 
| 707 | 707 | ||
| 708 | ret = OPENSSL_malloc(sizeof *ret); | 708 | ret = malloc(sizeof *ret); | 
| 709 | if (ret == NULL) | 709 | if (ret == NULL) | 
| 710 | { | 710 | { | 
| 711 | ECerr(EC_F_EC_POINT_NEW, ERR_R_MALLOC_FAILURE); | 711 | ECerr(EC_F_EC_POINT_NEW, ERR_R_MALLOC_FAILURE); | 
| @@ -716,7 +716,7 @@ EC_POINT *EC_POINT_new(const EC_GROUP *group) | |||
| 716 | 716 | ||
| 717 | if (!ret->meth->point_init(ret)) | 717 | if (!ret->meth->point_init(ret)) | 
| 718 | { | 718 | { | 
| 719 | OPENSSL_free(ret); | 719 | free(ret); | 
| 720 | return NULL; | 720 | return NULL; | 
| 721 | } | 721 | } | 
| 722 | 722 | ||
| @@ -730,7 +730,7 @@ void EC_POINT_free(EC_POINT *point) | |||
| 730 | 730 | ||
| 731 | if (point->meth->point_finish != 0) | 731 | if (point->meth->point_finish != 0) | 
| 732 | point->meth->point_finish(point); | 732 | point->meth->point_finish(point); | 
| 733 | OPENSSL_free(point); | 733 | free(point); | 
| 734 | } | 734 | } | 
| 735 | 735 | ||
| 736 | 736 | ||
| @@ -743,7 +743,7 @@ void EC_POINT_clear_free(EC_POINT *point) | |||
| 743 | else if (point->meth->point_finish != 0) | 743 | else if (point->meth->point_finish != 0) | 
| 744 | point->meth->point_finish(point); | 744 | point->meth->point_finish(point); | 
| 745 | OPENSSL_cleanse(point, sizeof *point); | 745 | OPENSSL_cleanse(point, sizeof *point); | 
| 746 | OPENSSL_free(point); | 746 | free(point); | 
| 747 | } | 747 | } | 
| 748 | 748 | ||
| 749 | 749 | ||
