diff options
author | inoguchi <> | 2021-03-28 12:38:52 +0000 |
---|---|---|
committer | inoguchi <> | 2021-03-28 12:38:52 +0000 |
commit | 95147217c231df8cc68de1614244180eb644ec79 (patch) | |
tree | 7a19d178b02ea10a4651c372c7bae7d0859be742 | |
parent | 339f42ec05d6bdb3a1b68cb621c612c72a5e571f (diff) | |
download | openbsd-95147217c231df8cc68de1614244180eb644ec79.tar.gz openbsd-95147217c231df8cc68de1614244180eb644ec79.tar.bz2 openbsd-95147217c231df8cc68de1614244180eb644ec79.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@
-rw-r--r-- | src/usr.bin/openssl/apps.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h index d5f3706ee7..77fa8c4ebc 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.25 2021/03/24 12:07:39 inoguchi Exp $ */ | 1 | /* $OpenBSD: apps.h,v 1.26 2021/03/28 12:38:52 inoguchi 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,4 +329,6 @@ 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 | |||
332 | #endif | 334 | #endif |