Page MenuHomeFreeBSD
Files F110239375

D25493.diff
No OneTemporary
Actions

D25493.diff
View Options

Index: head/secure/lib/libcrypto/opensslconf.h.in
===================================================================
--- head/secure/lib/libcrypto/opensslconf.h.in
+++ head/secure/lib/libcrypto/opensslconf.h.in
@@ -79,6 +79,9 @@
#ifndef OPENSSL_NO_SSL3
# define OPENSSL_NO_SSL3
#endif
+#ifndef OPENSSL_NO_SSL3_METHOD
+# define OPENSSL_NO_SSL3_METHOD
+#endif
#ifndef OPENSSL_NO_UBSAN
# define OPENSSL_NO_UBSAN
#endif
Index: head/secure/lib/libssl/Makefile
===================================================================
--- head/secure/lib/libssl/Makefile
+++ head/secure/lib/libssl/Makefile
@@ -22,6 +22,8 @@
SRCS+= extensions.c extensions_clnt.c extensions_cust.c extensions_srvr.c
SRCS+= statem.c statem_clnt.c statem_dtls.c statem_lib.c statem_srvr.c
+SRCS+= dummy_abi.c
+
LIBADD= crypto
CFLAGS+= -I${LCRYPTO_SRC}/ssl
Index: head/secure/lib/libssl/dummy_abi.c
===================================================================
--- head/secure/lib/libssl/dummy_abi.c
+++ head/secure/lib/libssl/dummy_abi.c
@@ -0,0 +1,46 @@
+/* This file is in the public domain. */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <stdbool.h>
+#include <unistd.h>
+
+#include <openssl/ssl.h>
+
+static inline void
+__SSLv3_dummy_method_impl(void)
+{
+ static const char warning[] = "SSLv3 use is deprecated.\n";
+ static bool once = false;
+
+ if (once)
+ return;
+
+ once = true;
+ write(STDERR_FILENO, warning, sizeof(warning) - 1);
+}
+
+const SSL_METHOD *
+__SSLv3_method_fbsd12(void)
+{
+ __SSLv3_dummy_method_impl();
+ return (NULL);
+}
+__sym_compat(SSLv3_method, __SSLv3_method_fbsd12, OPENSSL_1_1_0);
+
+const SSL_METHOD *
+__SSLv3_client_method_fbsd12(void)
+{
+ __SSLv3_dummy_method_impl();
+ return (NULL);
+}
+__sym_compat(SSLv3_client_method, __SSLv3_client_method_fbsd12, OPENSSL_1_1_0);
+
+const SSL_METHOD *
+__SSLv3_server_method_fbsd12(void)
+{
+ __SSLv3_dummy_method_impl();
+ return (NULL);
+}
+__sym_compat(SSLv3_server_method, __SSLv3_server_method_fbsd12, OPENSSL_1_1_0);

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 16, 2:23 PM (16 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16674788
Default Alt Text
D25493.diff (1 KB)

Event Timeline