summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/apps.c
diff options
context:
space:
mode:
authorjsing <>2017-08-12 21:04:33 +0000
committerjsing <>2017-08-12 21:04:33 +0000
commitf5ab0b8eff0fa56ebb9269ebd0025de4de12c7b1 (patch)
treee7e569fbc06330207e7d1e07039bce149208989a /src/usr.bin/openssl/apps.c
parentc648197458d45db4f93561e9497fac0532e6d0bc (diff)
downloadopenbsd-f5ab0b8eff0fa56ebb9269ebd0025de4de12c7b1.tar.gz
openbsd-f5ab0b8eff0fa56ebb9269ebd0025de4de12c7b1.tar.bz2
openbsd-f5ab0b8eff0fa56ebb9269ebd0025de4de12c7b1.zip
Remove NPN support - the -nextprotoneg options now become no-ops.
ok bcook@ beck@ doug@
Diffstat (limited to 'src/usr.bin/openssl/apps.c')
-rw-r--r--src/usr.bin/openssl/apps.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c
index 7594e77c19..a63bbf9c13 100644
--- a/src/usr.bin/openssl/apps.c
+++ b/src/usr.bin/openssl/apps.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: apps.c,v 1.43 2017/04/18 02:15:50 deraadt Exp $ */ 1/* $OpenBSD: apps.c,v 1.44 2017/08/12 21:04:33 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -2079,7 +2079,8 @@ policies_print(BIO *out, X509_STORE_CTX *ctx)
2079 BIO_free(out); 2079 BIO_free(out);
2080} 2080}
2081 2081
2082/* next_protos_parse parses a comma separated list of strings into a string 2082/*
2083 * next_protos_parse parses a comma separated list of strings into a string
2083 * in a format suitable for passing to SSL_CTX_set_next_protos_advertised. 2084 * in a format suitable for passing to SSL_CTX_set_next_protos_advertised.
2084 * outlen: (output) set to the length of the resulting buffer on success. 2085 * outlen: (output) set to the length of the resulting buffer on success.
2085 * err: (maybe NULL) on failure, an error message line is written to this BIO. 2086 * err: (maybe NULL) on failure, an error message line is written to this BIO.