summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/apps.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr.bin/openssl/apps.c')
-rw-r--r--src/usr.bin/openssl/apps.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c
index a042f074f9..009f48652a 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.13 2014/12/03 22:16:02 bcook Exp $ */ 1/* $OpenBSD: apps.c,v 1.14 2014/12/14 14:42:06 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -2163,7 +2163,6 @@ policies_print(BIO *out, X509_STORE_CTX *ctx)
2163 BIO_free(out); 2163 BIO_free(out);
2164} 2164}
2165 2165
2166#if !defined(OPENSSL_NO_NEXTPROTONEG)
2167/* next_protos_parse parses a comma separated list of strings into a string 2166/* next_protos_parse parses a comma separated list of strings into a string
2168 * in a format suitable for passing to SSL_CTX_set_next_protos_advertised. 2167 * in a format suitable for passing to SSL_CTX_set_next_protos_advertised.
2169 * outlen: (output) set to the length of the resulting buffer on success. 2168 * outlen: (output) set to the length of the resulting buffer on success.
@@ -2202,8 +2201,6 @@ next_protos_parse(unsigned short *outlen, const char *in)
2202 *outlen = len + 1; 2201 *outlen = len + 1;
2203 return out; 2202 return out;
2204} 2203}
2205#endif
2206/* !OPENSSL_NO_NEXTPROTONEG */
2207 2204
2208int 2205int
2209app_isdir(const char *name) 2206app_isdir(const char *name)