Remove workarounds for SSL_is_dtls()

Reminded by inoguchi jsing

diff --git a/usr.bin/openssl/apps.c b/usr.bin/openssl/apps.c
index 396a693..5e4e8d5 100644 (file)
--- a/usr.bin/openssl/apps.c
+++ b/usr.bin/openssl/apps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.c,v 1.59 2021/03/24 12:07:39 inoguchi Exp $ */
+/* $OpenBSD: apps.c,v 1.60 2021/03/31 17:13:54 tb Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -2340,10 +2340,3 @@ show_cipher(const OBJ_NAME *name, void *arg)
 
        fprintf(stderr, " -%-24s%s", name->name, (++*n % 3 != 0 ? "" : "\n"));
 }
-
-int
-SSL_is_dtls(const SSL *s)
-{
-       return SSL_version(s) == DTLS1_VERSION ||
-           SSL_version(s) == DTLS1_2_VERSION;
-}

diff --git a/usr.bin/openssl/apps.h b/usr.bin/openssl/apps.h
index 77fa8c4..9a4ffd0 100644 (file)
--- a/usr.bin/openssl/apps.h
+++ b/usr.bin/openssl/apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.h,v 1.26 2021/03/28 12:38:52 inoguchi Exp $ */
+/* $OpenBSD: apps.h,v 1.27 2021/03/31 17:13:54 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -329,6 +329,4 @@ int options_parse(int argc, char **argv, const struct option *opts,
 
 void show_cipher(const OBJ_NAME *name, void *arg);
 
-#define SSL_is_dtls _SSL_is_dtls
-
 #endif