diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-11-10 12:38:42 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-11-10 12:38:42 +1100 |
commit | 2c89430119367eb1bc96ea5ee55de83357e4c926 (patch) | |
tree | e1f51670a4757a0596e424a4db219f8e5538aeb6 | |
parent | dd5264db5f641dbd03186f9e5e83e4b14b3d0003 (diff) |
- (dtucker) [key.c] Check for the correct defines for NID_secp521r1.
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | key.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -10,6 +10,7 @@ | |||
10 | that doesn't work (see https://bugzilla.redhat.com/show_bug.cgi?id=1021897). | 10 | that doesn't work (see https://bugzilla.redhat.com/show_bug.cgi?id=1021897). |
11 | - (dtucker) [configure.ac] Fix brackets in NID_secp521r1 test. | 11 | - (dtucker) [configure.ac] Fix brackets in NID_secp521r1 test. |
12 | - (dtucker) [configure.ac] Add missing "test". | 12 | - (dtucker) [configure.ac] Add missing "test". |
13 | - (dtucker) [key.c] Check for the correct defines for NID_secp521r1. | ||
13 | 14 | ||
14 | 20131108 | 15 | 20131108 |
15 | - (dtucker) OpenBSD CVS Sync | 16 | - (dtucker) OpenBSD CVS Sync |
@@ -1104,7 +1104,7 @@ key_ecdsa_bits_to_nid(int bits) | |||
1104 | return NID_X9_62_prime256v1; | 1104 | return NID_X9_62_prime256v1; |
1105 | case 384: | 1105 | case 384: |
1106 | return NID_secp384r1; | 1106 | return NID_secp384r1; |
1107 | # ifdef HAVE_OPENSSL_NISTP521 | 1107 | # ifdef OPENSSL_HAS_NISTP521 |
1108 | case 521: | 1108 | case 521: |
1109 | return NID_secp521r1; | 1109 | return NID_secp521r1; |
1110 | # endif | 1110 | # endif |
@@ -2058,7 +2058,7 @@ key_curve_nid_to_bits(int nid) | |||
2058 | return 256; | 2058 | return 256; |
2059 | case NID_secp384r1: | 2059 | case NID_secp384r1: |
2060 | return 384; | 2060 | return 384; |
2061 | # ifdef OPENSSL_NAS_NISTP521 | 2061 | # ifdef OPENSSL_HAS_NISTP521 |
2062 | case NID_secp521r1: | 2062 | case NID_secp521r1: |
2063 | return 521; | 2063 | return 521; |
2064 | # endif | 2064 | # endif |