diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libssl/src/apps/apps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/src/apps/apps.c b/src/lib/libssl/src/apps/apps.c index e54aa7778b..17f4f7668c 100644 --- a/src/lib/libssl/src/apps/apps.c +++ b/src/lib/libssl/src/apps/apps.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: apps.c,v 1.61 2014/07/09 09:06:58 bcook Exp $ */ | 1 | /* $OpenBSD: apps.c,v 1.62 2014/07/09 20:37:20 tedu 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 | * |
@@ -2229,8 +2229,8 @@ next_protos_parse(unsigned short *outlen, const char *in) | |||
2229 | *outlen = len + 1; | 2229 | *outlen = len + 1; |
2230 | return out; | 2230 | return out; |
2231 | } | 2231 | } |
2232 | #endif /* !OPENSSL_NO_TLSEXT && | 2232 | #endif |
2233 | * !OPENSSL_NO_NEXTPROTONEG */ | 2233 | /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */ |
2234 | 2234 | ||
2235 | double | 2235 | double |
2236 | app_tminterval(int stop, int usertime) | 2236 | app_tminterval(int stop, int usertime) |