From 617d5ee3e624c62395848524aff60bef099a9a28 Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Tue, 8 Apr 2014 16:32:50 +0200
Subject: [PATCH] OpenSSL: update to version 1.0.1g

Fixes #1118.
---
 libports/lib/mk/libcrypto.mk | 4 ++--
 libports/lib/mk/libssl.mk    | 4 ++--
 libports/ports/openssl.mk    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libports/lib/mk/libcrypto.mk b/libports/lib/mk/libcrypto.mk
index a3dd08a26f..1dd1150cb6 100644
--- a/libports/lib/mk/libcrypto.mk
+++ b/libports/lib/mk/libcrypto.mk
@@ -1,5 +1,5 @@
 LIBCRYPTO     = libcrypto-1.0.0
-LIBCRYPTO_DIR = $(REP_DIR)/contrib/openssl-1.0.1c/crypto
+LIBCRYPTO_DIR = $(REP_DIR)/contrib/openssl-1.0.1g/crypto
 
 #
 # ARM is not supported currently (needs testing)
@@ -102,7 +102,7 @@ SRC_C_err      = err.c err_all.c err_prn.c
 #
 # evp (e_camellia.c x86 only?)
 #
-SRC_C_evp      = encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
+SRC_C_evp      = encode.c digest.c evp_cnf.c evp_enc.c evp_key.c evp_acnf.c \
                  e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c e_rc4.c \
                  e_aes.c names.c e_seed.c e_xcbc_d.c e_rc2.c e_cast.c \
                  e_rc5.c m_null.c m_md2.c m_md4.c m_md5.c m_sha.c \
diff --git a/libports/lib/mk/libssl.mk b/libports/lib/mk/libssl.mk
index 7a850138fc..09deebb12c 100644
--- a/libports/lib/mk/libssl.mk
+++ b/libports/lib/mk/libssl.mk
@@ -1,5 +1,5 @@
 LIBSSL     = libssl-1.0.0
-LIBSSL_DIR = $(REP_DIR)/contrib/openssl-1.0.1c
+LIBSSL_DIR = $(REP_DIR)/contrib/openssl-1.0.1g
 
 #
 # ARM is not supported currently (needs testing)
@@ -9,7 +9,7 @@ REQUIRES = x86
 LIBS      += libc libcrypto
 
 SRC_C = s2_meth.c   s2_srvr.c s2_clnt.c  s2_lib.c  s2_enc.c s2_pkt.c \
-        s3_meth.c   s3_srvr.c s3_clnt.c  s3_lib.c  s3_enc.c s3_pkt.c s3_both.c \
+        s3_meth.c   s3_srvr.c s3_clnt.c  s3_lib.c  s3_enc.c s3_pkt.c s3_both.c s3_cbc.c \
         s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c          s23_pkt.c \
         t1_meth.c   t1_srvr.c t1_clnt.c  t1_lib.c  t1_enc.c \
         d1_meth.c   d1_srvr.c d1_clnt.c  d1_lib.c  d1_pkt.c \
diff --git a/libports/ports/openssl.mk b/libports/ports/openssl.mk
index 231711fbb3..d7e8ec56bf 100644
--- a/libports/ports/openssl.mk
+++ b/libports/ports/openssl.mk
@@ -1,4 +1,4 @@
-OPENSSL_VERSION  = 1.0.1c
+OPENSSL_VERSION  = 1.0.1g
 OPENSSL          = openssl-$(OPENSSL_VERSION)
 OPENSSL_TGZ      = $(OPENSSL).tar.gz
 OPENSSL_SIG      = $(OPENSSL_TGZ).asc