diff options
| author | jsing <> | 2014-12-14 14:45:33 +0000 |
|---|---|---|
| committer | jsing <> | 2014-12-14 14:45:33 +0000 |
| commit | a7291f40f745eb67bcb73b937f5c7bf57b9c87ce (patch) | |
| tree | c731fb3d6408a05f8639b924894349c92f373669 /src | |
| parent | 45a57065d1148899826db257e083825843357376 (diff) | |
| download | openbsd-a7291f40f745eb67bcb73b937f5c7bf57b9c87ce.tar.gz openbsd-a7291f40f745eb67bcb73b937f5c7bf57b9c87ce.tar.bz2 openbsd-a7291f40f745eb67bcb73b937f5c7bf57b9c87ce.zip | |
Remove redundant NULL checks before free - BN_free(), BIO_free_all() and
EC_GROUP_free() all have implicit NULL checks.
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/ecparam.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/usr.bin/openssl/ecparam.c b/src/usr.bin/openssl/ecparam.c index 4b2119ee21..1441fa7d2a 100644 --- a/src/usr.bin/openssl/ecparam.c +++ b/src/usr.bin/openssl/ecparam.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ecparam.c,v 1.5 2014/12/07 14:58:50 jsing Exp $ */ | 1 | /* $OpenBSD: ecparam.c,v 1.6 2014/12/14 14:45:33 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
| 4 | */ | 4 | */ |
| @@ -583,25 +583,20 @@ ecparam_main(int argc, char **argv) | |||
| 583 | EC_KEY_free(eckey); | 583 | EC_KEY_free(eckey); |
| 584 | } | 584 | } |
| 585 | ret = 0; | 585 | ret = 0; |
| 586 | |||
| 586 | end: | 587 | end: |
| 587 | if (ec_p) | 588 | BN_free(ec_p); |
| 588 | BN_free(ec_p); | 589 | BN_free(ec_a); |
| 589 | if (ec_a) | 590 | BN_free(ec_b); |
| 590 | BN_free(ec_a); | 591 | BN_free(ec_gen); |
| 591 | if (ec_b) | 592 | BN_free(ec_order); |
| 592 | BN_free(ec_b); | 593 | BN_free(ec_cofactor); |
| 593 | if (ec_gen) | 594 | |
| 594 | BN_free(ec_gen); | ||
| 595 | if (ec_order) | ||
| 596 | BN_free(ec_order); | ||
| 597 | if (ec_cofactor) | ||
| 598 | BN_free(ec_cofactor); | ||
| 599 | free(buffer); | 595 | free(buffer); |
| 596 | |||
| 600 | BIO_free(in); | 597 | BIO_free(in); |
| 601 | if (out != NULL) | 598 | BIO_free_all(out); |
| 602 | BIO_free_all(out); | 599 | EC_GROUP_free(group); |
| 603 | if (group != NULL) | ||
| 604 | EC_GROUP_free(group); | ||
| 605 | 600 | ||
| 606 | return (ret); | 601 | return (ret); |
| 607 | } | 602 | } |