diff options
author | jsing <> | 2018-11-08 20:55:18 +0000 |
---|---|---|
committer | jsing <> | 2018-11-08 20:55:18 +0000 |
commit | 282c11bdbc9506966def8e70d943547afeec3c63 (patch) | |
tree | a970ddfd423ef6778696482b13ad31cb6984e3f0 /src/lib/libssl/ssl_clnt.c | |
parent | d1d568e5589418aecc7cdb33ca2338d20ce7c5d8 (diff) | |
download | openbsd-282c11bdbc9506966def8e70d943547afeec3c63.tar.gz openbsd-282c11bdbc9506966def8e70d943547afeec3c63.tar.bz2 openbsd-282c11bdbc9506966def8e70d943547afeec3c63.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/ssl_clnt.c')
-rw-r--r-- | src/lib/libssl/ssl_clnt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c index 8c3ec80060..22e41da953 100644 --- a/src/lib/libssl/ssl_clnt.c +++ b/src/lib/libssl/ssl_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_clnt.c,v 1.35 2018/11/08 20:26:45 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_clnt.c,v 1.36 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 | * |
@@ -2527,8 +2527,8 @@ ssl3_send_client_certificate(SSL *s) | |||
2527 | memset(&cbb, 0, sizeof(cbb)); | 2527 | memset(&cbb, 0, sizeof(cbb)); |
2528 | 2528 | ||
2529 | if (S3I(s)->hs.state == SSL3_ST_CW_CERT_A) { | 2529 | if (S3I(s)->hs.state == SSL3_ST_CW_CERT_A) { |
2530 | if ((s->cert == NULL) || (s->cert->key->x509 == NULL) || | 2530 | if (s->cert->key->x509 == NULL || |
2531 | (s->cert->key->privatekey == NULL)) | 2531 | s->cert->key->privatekey == NULL) |
2532 | S3I(s)->hs.state = SSL3_ST_CW_CERT_B; | 2532 | S3I(s)->hs.state = SSL3_ST_CW_CERT_B; |
2533 | else | 2533 | else |
2534 | S3I(s)->hs.state = SSL3_ST_CW_CERT_C; | 2534 | S3I(s)->hs.state = SSL3_ST_CW_CERT_C; |