summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbeck <beck@openbsd.org>2019-01-23 23:47:13 +0000
committerbeck <beck@openbsd.org>2019-01-23 23:47:13 +0000
commit8b21e38af7c28d9a25ae47ae983089cdb1604696 (patch)
treec3df5c1c12f307a4be335eb5d55b85a2869d7a92
parentmake whitespace inside curlies consistent; sort function prototypes. (diff)
downloadwireguard-openbsd-8b21e38af7c28d9a25ae47ae983089cdb1604696.tar.xz
wireguard-openbsd-8b21e38af7c28d9a25ae47ae983089cdb1604696.zip
Correct ECDSA_SECP512R1 typo to ECDSA_SECP521R1
spotted by naddy@
-rw-r--r--lib/libssl/ssl_sigalgs.c8
-rw-r--r--lib/libssl/ssl_sigalgs.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libssl/ssl_sigalgs.c b/lib/libssl/ssl_sigalgs.c
index 041e940d8e6..76cb441b075 100644
--- a/lib/libssl/ssl_sigalgs.c
+++ b/lib/libssl/ssl_sigalgs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_sigalgs.c,v 1.14 2019/01/23 18:39:28 beck Exp $ */
+/* $OpenBSD: ssl_sigalgs.c,v 1.15 2019/01/23 23:47:13 beck Exp $ */
/*
* Copyright (c) 2018-2019 Bob Beck <beck@openbsd.org>
*
@@ -32,7 +32,7 @@ const struct ssl_sigalg sigalgs[] = {
.pkey_idx = SSL_PKEY_RSA_SIGN,
},
{
- .value = SIGALG_ECDSA_SECP512R1_SHA512,
+ .value = SIGALG_ECDSA_SECP521R1_SHA512,
.md = EVP_sha512,
.key_type = EVP_PKEY_EC,
.pkey_idx = SSL_PKEY_ECC,
@@ -167,7 +167,7 @@ const struct ssl_sigalg sigalgs[] = {
uint16_t tls13_sigalgs[] = {
SIGALG_RSA_PSS_RSAE_SHA512,
SIGALG_RSA_PKCS1_SHA512,
- SIGALG_ECDSA_SECP512R1_SHA512,
+ SIGALG_ECDSA_SECP521R1_SHA512,
SIGALG_RSA_PSS_RSAE_SHA384,
SIGALG_RSA_PKCS1_SHA384,
SIGALG_ECDSA_SECP384R1_SHA384,
@@ -181,7 +181,7 @@ size_t tls13_sigalgs_len = (sizeof(tls13_sigalgs) / sizeof(tls13_sigalgs[0]));
uint16_t tls12_sigalgs[] = {
SIGALG_RSA_PSS_RSAE_SHA512,
SIGALG_RSA_PKCS1_SHA512,
- SIGALG_ECDSA_SECP512R1_SHA512,
+ SIGALG_ECDSA_SECP521R1_SHA512,
SIGALG_GOSTR12_512_STREEBOG_512,
SIGALG_RSA_PSS_RSAE_SHA384,
SIGALG_RSA_PKCS1_SHA384,
diff --git a/lib/libssl/ssl_sigalgs.h b/lib/libssl/ssl_sigalgs.h
index 0bc7322e17f..d05f66f7ba4 100644
--- a/lib/libssl/ssl_sigalgs.h
+++ b/lib/libssl/ssl_sigalgs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_sigalgs.h,v 1.11 2019/01/23 18:39:28 beck Exp $ */
+/* $OpenBSD: ssl_sigalgs.h,v 1.12 2019/01/23 23:47:13 beck Exp $ */
/*
* Copyright (c) 2018, Bob Beck <beck@openbsd.org>
*
@@ -33,7 +33,7 @@ __BEGIN_HIDDEN_DECLS
#define SIGALG_ECDSA_SECP224R1_SHA224 0x0303
#define SIGALG_ECDSA_SECP256R1_SHA256 0x0403
#define SIGALG_ECDSA_SECP384R1_SHA384 0x0503
-#define SIGALG_ECDSA_SECP512R1_SHA512 0x0603
+#define SIGALG_ECDSA_SECP521R1_SHA512 0x0603
#define SIGALG_RSA_PSS_RSAE_SHA256 0x0804
#define SIGALG_RSA_PSS_RSAE_SHA384 0x0805
#define SIGALG_RSA_PSS_RSAE_SHA512 0x0806