diff options
Diffstat (limited to 'src/usr.bin/openssl/apps.c')
| -rw-r--r-- | src/usr.bin/openssl/apps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c index 6ffdf3df1a..78555528b6 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.11 2014/10/16 10:43:54 jsing Exp $ */ | 1 | /* $OpenBSD: apps.c,v 1.12 2014/11/07 14:16:48 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,7 @@ 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_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) | 2166 | #if !defined(OPENSSL_NO_NEXTPROTONEG) |
| 2167 | /* next_protos_parse parses a comma separated list of strings into a string | 2167 | /* 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. | 2168 | * 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. | 2169 | * outlen: (output) set to the length of the resulting buffer on success. |
| @@ -2203,7 +2203,7 @@ next_protos_parse(unsigned short *outlen, const char *in) | |||
| 2203 | return out; | 2203 | return out; |
| 2204 | } | 2204 | } |
| 2205 | #endif | 2205 | #endif |
| 2206 | /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */ | 2206 | /* !OPENSSL_NO_NEXTPROTONEG */ |
| 2207 | 2207 | ||
| 2208 | double | 2208 | double |
| 2209 | app_tminterval(int stop, int usertime) | 2209 | app_tminterval(int stop, int usertime) |
