From 4c65e432d6d8da5615807b74c35252bbcb5d40f7 Mon Sep 17 00:00:00 2001 From: inoguchi Date: Sun, 28 Mar 2021 12:38:52 +0000 Subject: [PATCH] Fix duplicate SSL_is_dtls in libssl and apps.c Currently, SSL_is_dtls exists in both libssl and apps.c, and one in libssl is guarded by LIBRESSL_INTERNAL and not exposed yet. This causes portable build broke with openssl(1) and optionstest. To solve this temporarily, rename SSL_is_dtls by apps.h. This temporary renaming will be removed when the SSL_is_dtls() is exposed. ok jsing@ --- usr.bin/openssl/apps.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.bin/openssl/apps.h b/usr.bin/openssl/apps.h index d5f3706ee75..77fa8c4ebce 100644 --- a/usr.bin/openssl/apps.h +++ b/usr.bin/openssl/apps.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.h,v 1.25 2021/03/24 12:07:39 inoguchi Exp $ */ +/* $OpenBSD: apps.h,v 1.26 2021/03/28 12:38:52 inoguchi Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -329,4 +329,6 @@ 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 -- 2.20.1