diff options
| author |   jsing <jsing@openbsd.org> | 2020-05-19 16:35:20 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2020-05-19 16:35:20 +0000 |
| commit | 169335620533869b7ff0801b3d95964c01249888 (patch) | |
| tree | 0271c2a606a5c267d8e59fc81f11bc5d08e034d6 /lib/libssl/ssl_both.c | |
| parent | We need to double the clock frequency for DDR modes. (diff) | |
| download | wireguard-openbsd-169335620533869b7ff0801b3d95964c01249888.tar.xz wireguard-openbsd-169335620533869b7ff0801b3d95964c01249888.zip | |
Replace SSL_PKEY_RSA_ENC/SSL_PKEY_RSA_SIGN with SSL_PKEY_RSA.
Some time prior to SSLeay 0.8.1b, SSL_PKEY_RSA_SIGN got added with the
intention of handling RSA sign only certificates... this incomplete code
had the following comment:
/* check to see if this is a signing only certificate */
/* EAY EAY EAY EAY */
And while the comment was removed in 2005, the incomplete RSA sign-only
handling has remained ever since.
Remove SSL_PKEY_RSA_SIGN and rename SSL_PKEY_RSA_ENC to SSL_PKEY_RSA. While
here also remove the unused SSL_PKEY_DH_RSA.
ok tb@
Diffstat (limited to 'lib/libssl/ssl_both.c')
| -rw-r--r-- | lib/libssl/ssl_both.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/ssl_both.c b/lib/libssl/ssl_both.c index b8929d8f848..488a5ff7c93 100644 --- a/lib/libssl/ssl_both.c +++ b/lib/libssl/ssl_both.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_both.c,v 1.17 2020/03/12 17:15:33 jsing Exp $ */ +/* $OpenBSD: ssl_both.c,v 1.18 2020/05/19 16:35:20 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -591,7 +591,7 @@ ssl_cert_type(X509 *x, EVP_PKEY *pkey) i = pk->type; if (i == EVP_PKEY_RSA) { - ret = SSL_PKEY_RSA_ENC; + ret = SSL_PKEY_RSA; } else if (i == EVP_PKEY_EC) { ret = SSL_PKEY_ECC; } else if (i == NID_id_GostR3410_2001 || |