diff options
author | jsing <> | 2018-02-10 04:48:17 +0000 |
---|---|---|
committer | jsing <> | 2018-02-10 04:48:17 +0000 |
commit | 9a789c8343a478b9c5fb28eb91f5f91f6819c46e (patch) | |
tree | f245b7f2f47badfadee1149040004fe32b666ebd /src | |
parent | a65702226b7ff26155233ebc9d8ece695d77fba7 (diff) | |
download | openbsd-9a789c8343a478b9c5fb28eb91f5f91f6819c46e.tar.gz openbsd-9a789c8343a478b9c5fb28eb91f5f91f6819c46e.tar.bz2 openbsd-9a789c8343a478b9c5fb28eb91f5f91f6819c46e.zip |
Remove NULL check from tls_conninfo_cert_pem() - all of the other conninfo
functions require the conninfo passed in to be non-NULL.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libtls/tls_conninfo.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libtls/tls_conninfo.c b/src/lib/libtls/tls_conninfo.c index 34535b5668..208d1e1062 100644 --- a/src/lib/libtls/tls_conninfo.c +++ b/src/lib/libtls/tls_conninfo.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls_conninfo.c,v 1.18 2018/02/10 04:41:24 jsing Exp $ */ | 1 | /* $OpenBSD: tls_conninfo.c,v 1.19 2018/02/10 04:48:17 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2015 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2015 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2015 Bob Beck <beck@openbsd.org> | 4 | * Copyright (c) 2015 Bob Beck <beck@openbsd.org> |
@@ -185,8 +185,6 @@ tls_conninfo_cert_pem(struct tls *ctx) | |||
185 | BIO *membio = NULL; | 185 | BIO *membio = NULL; |
186 | BUF_MEM *bptr = NULL; | 186 | BUF_MEM *bptr = NULL; |
187 | 187 | ||
188 | if (ctx->conninfo == NULL) | ||
189 | goto err; | ||
190 | if (ctx->ssl_peer_cert == NULL) | 188 | if (ctx->ssl_peer_cert == NULL) |
191 | return 0; | 189 | return 0; |
192 | if ((membio = BIO_new(BIO_s_mem()))== NULL) | 190 | if ((membio = BIO_new(BIO_s_mem()))== NULL) |