]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
- (dtucker) [key.c] Check for the correct defines for NID_secp521r1.
authorDarren Tucker <dtucker@zip.com.au>
Sun, 10 Nov 2013 01:38:42 +0000 (12:38 +1100)
committerDarren Tucker <dtucker@zip.com.au>
Sun, 10 Nov 2013 01:38:42 +0000 (12:38 +1100)
ChangeLog
key.c

index 3f9cfae04e291644f7ad74bf1695cd1b719afa53..e22ac3cd46da6b7dba5e28d49741633a546a9daa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
    that doesn't work (see https://bugzilla.redhat.com/show_bug.cgi?id=1021897).
  - (dtucker) [configure.ac] Fix brackets in NID_secp521r1 test.
  - (dtucker) [configure.ac] Add missing "test".
+ - (dtucker) [key.c] Check for the correct defines for NID_secp521r1.
 
 20131108
  - (dtucker) OpenBSD CVS Sync
diff --git a/key.c b/key.c
index bc84953f346adbc4a2077e81f33bc65adead6e4a..b20bcda59ce16be62848ce474305725dbaae8525 100644 (file)
--- a/key.c
+++ b/key.c
@@ -1104,7 +1104,7 @@ key_ecdsa_bits_to_nid(int bits)
                return NID_X9_62_prime256v1;
        case 384:
                return NID_secp384r1;
-# ifdef HAVE_OPENSSL_NISTP521
+# ifdef OPENSSL_HAS_NISTP521
        case 521:
                return NID_secp521r1;
 # endif
@@ -2058,7 +2058,7 @@ key_curve_nid_to_bits(int nid)
                return 256;
        case NID_secp384r1:
                return 384;
-# ifdef OPENSSL_NAS_NISTP521
+# ifdef OPENSSL_HAS_NISTP521
        case NID_secp521r1:
                return 521;
 # endif