diff options
author | tb <> | 2021-08-31 20:14:40 +0000 |
---|---|---|
committer | tb <> | 2021-08-31 20:14:40 +0000 |
commit | aa22a52eaacf467f4410ed6bfb0eb8d7fc2ac99a (patch) | |
tree | 55f62fe48c46eefa1b6ce4f114cd129cc3eea66c | |
parent | f55a628b1a5faa0be72079bd24a247266121aa8b (diff) | |
download | openbsd-aa22a52eaacf467f4410ed6bfb0eb8d7fc2ac99a.tar.gz openbsd-aa22a52eaacf467f4410ed6bfb0eb8d7fc2ac99a.tar.bz2 openbsd-aa22a52eaacf467f4410ed6bfb0eb8d7fc2ac99a.zip |
Remove some dead code that was missed in an earlier cleanup and
fix a stale comment.
Found by mortimer with clang 13's -Wunused-but-set-variable.
ok beck
-rw-r--r-- | src/lib/libcrypto/ec/ec_asn1.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c index 06320b6588..befeee99af 100644 --- a/src/lib/libcrypto/ec/ec_asn1.c +++ b/src/lib/libcrypto/ec/ec_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_asn1.c,v 1.33 2021/04/20 17:12:43 tb Exp $ */ | 1 | /* $OpenBSD: ec_asn1.c,v 1.34 2021/08/31 20:14:40 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -801,12 +801,12 @@ ec_asn1_group2fieldid(const EC_GROUP * group, X9_62_FIELDID * field) | |||
801 | static int | 801 | static int |
802 | ec_asn1_group2curve(const EC_GROUP * group, X9_62_CURVE * curve) | 802 | ec_asn1_group2curve(const EC_GROUP * group, X9_62_CURVE * curve) |
803 | { | 803 | { |
804 | int ok = 0, nid; | ||
805 | BIGNUM *tmp_1 = NULL, *tmp_2 = NULL; | 804 | BIGNUM *tmp_1 = NULL, *tmp_2 = NULL; |
806 | unsigned char *buffer_1 = NULL, *buffer_2 = NULL, *a_buf = NULL, | 805 | unsigned char *buffer_1 = NULL, *buffer_2 = NULL, *a_buf = NULL, |
807 | *b_buf = NULL; | 806 | *b_buf = NULL; |
808 | size_t len_1, len_2; | 807 | size_t len_1, len_2; |
809 | unsigned char char_zero = 0; | 808 | unsigned char char_zero = 0; |
809 | int ok = 0; | ||
810 | 810 | ||
811 | if (!group || !curve || !curve->a || !curve->b) | 811 | if (!group || !curve || !curve->a || !curve->b) |
812 | return 0; | 812 | return 0; |
@@ -815,7 +815,6 @@ ec_asn1_group2curve(const EC_GROUP * group, X9_62_CURVE * curve) | |||
815 | ECerror(ERR_R_MALLOC_FAILURE); | 815 | ECerror(ERR_R_MALLOC_FAILURE); |
816 | goto err; | 816 | goto err; |
817 | } | 817 | } |
818 | nid = EC_METHOD_get_field_type(EC_GROUP_method_of(group)); | ||
819 | 818 | ||
820 | /* get a and b */ | 819 | /* get a and b */ |
821 | if (!EC_GROUP_get_curve(group, NULL, tmp_1, tmp_2, NULL)) { | 820 | if (!EC_GROUP_get_curve(group, NULL, tmp_1, tmp_2, NULL)) { |
@@ -1018,7 +1017,7 @@ ec_asn1_group2pkparameters(const EC_GROUP * group, ECPKPARAMETERS * params) | |||
1018 | if ((ret->value.named_curve = OBJ_nid2obj(tmp)) == NULL) | 1017 | if ((ret->value.named_curve = OBJ_nid2obj(tmp)) == NULL) |
1019 | ok = 0; | 1018 | ok = 0; |
1020 | } else | 1019 | } else |
1021 | /* we don't kmow the nid => ERROR */ | 1020 | /* we don't know the group => ERROR */ |
1022 | ok = 0; | 1021 | ok = 0; |
1023 | } else { | 1022 | } else { |
1024 | /* use the ECPARAMETERS structure */ | 1023 | /* use the ECPARAMETERS structure */ |