diff options
| author |   inoguchi <inoguchi@openbsd.org> | 2021-03-28 12:38:52 +0000 |
|---|---|---|
| committer | inoguchi <inoguchi@openbsd.org> | 2021-03-28 12:38:52 +0000 |
| commit | 4c65e432d6d8da5615807b74c35252bbcb5d40f7 (patch) | |
| tree | a0c0bb890559af7d6ffb3da383311d07e1c11b55 /usr.bin | |
| parent | list Dell DW5821e as supported for umb(4) (diff) | |
| download | wireguard-openbsd-4c65e432d6d8da5615807b74c35252bbcb5d40f7.tar.xz wireguard-openbsd-4c65e432d6d8da5615807b74c35252bbcb5d40f7.zip | |
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@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/openssl/apps.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 |