From 9f0928c6593f937a17b7974b04051c57e3874b20 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 12 Feb 2015 22:22:25 +0100
Subject: Update OpenSSL to AOSP -master

---
 main/openssl/ssl/s3_meth.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'main/openssl/ssl/s3_meth.c')

diff --git a/main/openssl/ssl/s3_meth.c b/main/openssl/ssl/s3_meth.c
index cdddb17b..4dec7033 100644
--- a/main/openssl/ssl/s3_meth.c
+++ b/main/openssl/ssl/s3_meth.c
@@ -60,7 +60,7 @@
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 
-static const SSL_METHOD *ssl3_get_method(int ver);
+#ifndef OPENSSL_NO_SSL3_METHOD
 static const SSL_METHOD *ssl3_get_method(int ver)
 	{
 	if (ver == SSL3_VERSION)
@@ -73,5 +73,4 @@ IMPLEMENT_ssl3_meth_func(SSLv3_method,
 			 ssl3_accept,
 			 ssl3_connect,
 			 ssl3_get_method)
-
-
+#endif
-- 
cgit v1.2.3