diff options
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
-rw-r--r-- | src/lib/libssl/ssl_cert.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index af8ef329b4..3567b7b426 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_cert.c,v 1.76 2019/05/15 09:13:16 bcook Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.77 2020/05/19 16:35:20 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -168,7 +168,7 @@ ssl_cert_new(void) | |||
168 | SSLerrorx(ERR_R_MALLOC_FAILURE); | 168 | SSLerrorx(ERR_R_MALLOC_FAILURE); |
169 | return (NULL); | 169 | return (NULL); |
170 | } | 170 | } |
171 | ret->key = &(ret->pkeys[SSL_PKEY_RSA_ENC]); | 171 | ret->key = &(ret->pkeys[SSL_PKEY_RSA]); |
172 | ret->references = 1; | 172 | ret->references = 1; |
173 | return (ret); | 173 | return (ret); |
174 | } | 174 | } |
@@ -240,15 +240,10 @@ ssl_cert_dup(CERT *cert) | |||
240 | * (Nothing at the moment, I think.) | 240 | * (Nothing at the moment, I think.) |
241 | */ | 241 | */ |
242 | 242 | ||
243 | case SSL_PKEY_RSA_ENC: | 243 | case SSL_PKEY_RSA: |
244 | case SSL_PKEY_RSA_SIGN: | ||
245 | /* We have an RSA key. */ | 244 | /* We have an RSA key. */ |
246 | break; | 245 | break; |
247 | 246 | ||
248 | case SSL_PKEY_DH_RSA: | ||
249 | /* We have a DH key. */ | ||
250 | break; | ||
251 | |||
252 | case SSL_PKEY_ECC: | 247 | case SSL_PKEY_ECC: |
253 | /* We have an ECC key */ | 248 | /* We have an ECC key */ |
254 | break; | 249 | break; |
@@ -377,7 +372,7 @@ ssl_sess_cert_new(void) | |||
377 | SSLerrorx(ERR_R_MALLOC_FAILURE); | 372 | SSLerrorx(ERR_R_MALLOC_FAILURE); |
378 | return NULL; | 373 | return NULL; |
379 | } | 374 | } |
380 | ret->peer_key = &(ret->peer_pkeys[SSL_PKEY_RSA_ENC]); | 375 | ret->peer_key = &(ret->peer_pkeys[SSL_PKEY_RSA]); |
381 | ret->references = 1; | 376 | ret->references = 1; |
382 | 377 | ||
383 | return ret; | 378 | return ret; |