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/openvpn/config-version.h |  2 +-
 main/openvpn/src/openvpn/ps.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

(limited to 'main/openvpn')

diff --git a/main/openvpn/config-version.h b/main/openvpn/config-version.h
index 4aa92283..6044ed8e 100644
--- a/main/openvpn/config-version.h
+++ b/main/openvpn/config-version.h
@@ -1,2 +1,2 @@
-#define CONFIGURE_GIT_REVISION "icsopenvpn_627-cff5e3e9c3ac08df"
+#define CONFIGURE_GIT_REVISION "icsopenvpn_629-3976c7f5f4d39f06"
 #define CONFIGURE_GIT_FLAGS ""
diff --git a/main/openvpn/src/openvpn/ps.c b/main/openvpn/src/openvpn/ps.c
index 6807aac0..fe18a9df 100644
--- a/main/openvpn/src/openvpn/ps.c
+++ b/main/openvpn/src/openvpn/ps.c
@@ -372,17 +372,6 @@ proxy_list_close (struct proxy_connection **list)
     }
 }
 
-static void
-sock_addr_set (struct openvpn_sockaddr *osaddr,
-	       const in_addr_t addr,
-	       const int port)
-{
-  CLEAR (*osaddr);
-  osaddr->addr.in4.sin_family = AF_INET;
-  osaddr->addr.in4.sin_addr.s_addr = htonl (addr);
-  osaddr->addr.in4.sin_port = htons (port);
-}
-
 static inline void
 proxy_connection_io_requeue (struct proxy_connection *pc, const int rwflags_new, struct event_set *es)
 {
-- 
cgit v1.2.3