diff options
-rw-r--r-- | src/usr.bin/openssl/apps.c | 9 | ||||
-rw-r--r-- | src/usr.bin/openssl/apps.h | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c index 396a693c6f..5e4e8d521c 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.59 2021/03/24 12:07:39 inoguchi Exp $ */ | 1 | /* $OpenBSD: apps.c,v 1.60 2021/03/31 17:13:54 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -2340,10 +2340,3 @@ show_cipher(const OBJ_NAME *name, void *arg) | |||
2340 | 2340 | ||
2341 | fprintf(stderr, " -%-24s%s", name->name, (++*n % 3 != 0 ? "" : "\n")); | 2341 | fprintf(stderr, " -%-24s%s", name->name, (++*n % 3 != 0 ? "" : "\n")); |
2342 | } | 2342 | } |
2343 | |||
2344 | int | ||
2345 | SSL_is_dtls(const SSL *s) | ||
2346 | { | ||
2347 | return SSL_version(s) == DTLS1_VERSION || | ||
2348 | SSL_version(s) == DTLS1_2_VERSION; | ||
2349 | } | ||
diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h index 77fa8c4ebc..9a4ffd00c7 100644 --- a/src/usr.bin/openssl/apps.h +++ b/src/usr.bin/openssl/apps.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: apps.h,v 1.26 2021/03/28 12:38:52 inoguchi Exp $ */ | 1 | /* $OpenBSD: apps.h,v 1.27 2021/03/31 17:13:54 tb 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 | * |
@@ -329,6 +329,4 @@ int options_parse(int argc, char **argv, const struct option *opts, | |||
329 | 329 | ||
330 | void show_cipher(const OBJ_NAME *name, void *arg); | 330 | void show_cipher(const OBJ_NAME *name, void *arg); |
331 | 331 | ||
332 | #define SSL_is_dtls _SSL_is_dtls | ||
333 | |||
334 | #endif | 332 | #endif |