diff options
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r-- | src/lib/libssl/t1_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index 1402996e42..567b3e48e0 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_lib.c,v 1.150 2018/11/10 01:19:09 beck Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.151 2019/01/23 16:46:04 beck 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 | * |
@@ -1002,11 +1002,12 @@ tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen, | |||
1002 | 1002 | ||
1003 | /* Set preferred digest for each key type */ | 1003 | /* Set preferred digest for each key type */ |
1004 | int | 1004 | int |
1005 | tls1_process_sigalgs(SSL *s, CBS *cbs) | 1005 | tls1_process_sigalgs(SSL *s, CBS *cbs, uint16_t *sigalgs, size_t sigalgs_len) |
1006 | { | 1006 | { |
1007 | CERT *c = s->cert; | 1007 | CERT *c = s->cert; |
1008 | 1008 | ||
1009 | /* Extension ignored for inappropriate versions */ | 1009 | /* Extension ignored for inappropriate versions */ |
1010 | /* XXX get rid of this? */ | ||
1010 | if (!SSL_USE_SIGALGS(s)) | 1011 | if (!SSL_USE_SIGALGS(s)) |
1011 | return 1; | 1012 | return 1; |
1012 | 1013 | ||
@@ -1023,9 +1024,8 @@ tls1_process_sigalgs(SSL *s, CBS *cbs) | |||
1023 | if (!CBS_get_u16(cbs, &sig_alg)) | 1024 | if (!CBS_get_u16(cbs, &sig_alg)) |
1024 | return 0; | 1025 | return 0; |
1025 | 1026 | ||
1026 | if ((sigalg = ssl_sigalg(sig_alg, tls12_sigalgs, | 1027 | if ((sigalg = ssl_sigalg(sig_alg, sigalgs, sigalgs_len)) != |
1027 | tls12_sigalgs_len)) != NULL && | 1028 | NULL && c->pkeys[sigalg->pkey_idx].sigalg == NULL) { |
1028 | c->pkeys[sigalg->pkey_idx].sigalg == NULL) { | ||
1029 | c->pkeys[sigalg->pkey_idx].sigalg = sigalg; | 1029 | c->pkeys[sigalg->pkey_idx].sigalg = sigalg; |
1030 | if (sigalg->pkey_idx == SSL_PKEY_RSA_SIGN) | 1030 | if (sigalg->pkey_idx == SSL_PKEY_RSA_SIGN) |
1031 | c->pkeys[SSL_PKEY_RSA_ENC].sigalg = sigalg; | 1031 | c->pkeys[SSL_PKEY_RSA_ENC].sigalg = sigalg; |