diff options
| author | jsing <> | 2018-11-08 20:55:18 +0000 |
|---|---|---|
| committer | jsing <> | 2018-11-08 20:55:18 +0000 |
| commit | c763627af1fbaca531b187d8fe0fc8c5eadfea85 (patch) | |
| tree | a970ddfd423ef6778696482b13ad31cb6984e3f0 /src/lib/libssl/t1_lib.c | |
| parent | 1cd5707208557d1e370547eacffdf78840a887da (diff) | |
| download | openbsd-c763627af1fbaca531b187d8fe0fc8c5eadfea85.tar.gz openbsd-c763627af1fbaca531b187d8fe0fc8c5eadfea85.tar.bz2 openbsd-c763627af1fbaca531b187d8fe0fc8c5eadfea85.zip | |
Stop pretending that a cert member in a SSL and SSL_CTX can be NULL.
ok beck@ tb@
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
| -rw-r--r-- | src/lib/libssl/t1_lib.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index 758f7b1e11..1cb0cfb453 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.147 2018/11/05 20:41:30 jsing Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.148 2018/11/08 20:55:18 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 | * |
| @@ -1150,10 +1150,6 @@ tls1_process_sigalgs(SSL *s, CBS *cbs) | |||
| 1150 | if (!SSL_USE_SIGALGS(s)) | 1150 | if (!SSL_USE_SIGALGS(s)) |
| 1151 | return 1; | 1151 | return 1; |
| 1152 | 1152 | ||
| 1153 | /* Should never happen */ | ||
| 1154 | if (c == NULL) | ||
| 1155 | return 0; | ||
| 1156 | |||
| 1157 | c->pkeys[SSL_PKEY_RSA_SIGN].digest = NULL; | 1153 | c->pkeys[SSL_PKEY_RSA_SIGN].digest = NULL; |
| 1158 | c->pkeys[SSL_PKEY_RSA_ENC].digest = NULL; | 1154 | c->pkeys[SSL_PKEY_RSA_ENC].digest = NULL; |
| 1159 | c->pkeys[SSL_PKEY_ECC].digest = NULL; | 1155 | c->pkeys[SSL_PKEY_ECC].digest = NULL; |
