main/openssl: security upgrade to 1.0.2a

CVE-2015-0291, CVE-2015-0290, CVE-2015-0207, CVE-2015-0286,
CVE-2015-0208, CVE-2015-0287, CVE-2015-0289, CVE-2015-0293,
CVE-2015-1787, CVE-2015-0285, CVE-2015-0209, CVE-2015-0288

3 files changed, 58 insertions, 77 deletions

diff --git a/main/openssl/0001-fix-manpages.patch b/main/openssl/0001-fix-manpages.patch
index d33adcacfe..031fe6b4c4 100644
--- a/main/openssl/0001-fix-manpages.patch
+++ b/main/openssl/0001-fix-manpages.patch
@@ -40,7 +40,6 @@ Subject: [PATCH] fix manpages
  doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod | 2 +-
  doc/crypto/bn.pod                         | 2 +-
  doc/crypto/crypto.pod                     | 2 +-
- doc/crypto/d2i_ECPKParameters.pod         | 2 +-
  doc/crypto/des.pod                        | 4 ++--
  doc/crypto/dh.pod                         | 4 ++--
  doc/crypto/dsa.pod                        | 2 +-
@@ -536,19 +535,6 @@ index f18edfe..4b0c678 100644
  L<OPENSSL_VERSION_NUMBER(3)|OPENSSL_VERSION_NUMBER(3)>
  
  =item INPUT/OUTPUT, DATA ENCODING
-diff --git a/doc/crypto/d2i_ECPKParameters.pod b/doc/crypto/d2i_ECPKParameters.pod
-index 3768c41..704b4ab 100644
---- a/doc/crypto/d2i_ECPKParameters.pod
-+++ b/doc/crypto/d2i_ECPKParameters.pod
-@@ -2,7 +2,7 @@
- 
- =head1 NAME
- 
--d2i_ECPKParameters, i2d_ECPKParameters, d2i_ECPKParameters_bio, i2d_ECPKParameters_bio, d2i_ECPKParameters_fp, i2d_ECPKParameters_fp(fp,x), ECPKParameters_print, ECPKParameters_print_fp - Functions for decoding and encoding ASN1 representations of elliptic curve entities
-+d2i_ECPKParameters, i2d_ECPKParameters, d2i_ECPKParameters_bio, i2d_ECPKParameters_bio, d2i_ECPKParameters_fp, i2d_ECPKParameters_fp, ECPKParameters_print, ECPKParameters_print_fp - Functions for decoding and encoding ASN1 representations of elliptic curve entities
- 
- =head1 SYNOPSIS
- 
 diff --git a/doc/crypto/des.pod b/doc/crypto/des.pod
 index e1add56..f7d8011 100644
 --- a/doc/crypto/des.pod
diff --git a/main/openssl/0005-fix-parallel-build.patch b/main/openssl/0005-fix-parallel-build.patch
index f33db3517e..24bc5d643e 100644
--- a/main/openssl/0005-fix-parallel-build.patch
+++ b/main/openssl/0005-fix-parallel-build.patch
@@ -1,21 +1,7 @@
-From ee8d4adddccd275f30cf3f489478f2fbc94dadbb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 5 Feb 2015 08:53:54 +0200
-Subject: [PATCH] fix parallel build
-
----
- Makefile.org     | 42 +++++++++++++++++---------------
- Makefile.shared  |  2 ++
- crypto/Makefile  | 10 ++++----
- engines/Makefile |  6 ++---
- test/Makefile    | 74 ++++++++++++++++++++++++++++----------------------------
- 5 files changed, 69 insertions(+), 65 deletions(-)
-
-diff --git a/Makefile.org b/Makefile.org
-index 035fa83..5dab54e 100644
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -274,17 +274,17 @@ build_all: build_libs build_apps build_tests build_tools
+diff -ru openssl-1.0.2a.orig/Makefile.org openssl-1.0.2a/Makefile.org
+--- openssl-1.0.2a.orig/Makefile.org	2015-03-19 13:30:36.000000000 +0000
++++ openssl-1.0.2a/Makefile.org	2015-03-19 14:53:31.246908039 +0000
+@@ -274,17 +274,17 @@
  build_libs: build_crypto build_ssl build_engines
  
  build_crypto:
@@ -44,7 +30,7 @@ index 035fa83..5dab54e 100644
  
  all_testapps: build_libs build_testapps
  build_testapps:
-@@ -536,9 +536,9 @@ dist:
+@@ -536,9 +536,9 @@
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  
@@ -56,7 +42,7 @@ index 035fa83..5dab54e 100644
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-@@ -547,12 +547,19 @@ install_sw:
+@@ -547,12 +547,19 @@
  		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
  		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
  		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
@@ -77,7 +63,7 @@ index 035fa83..5dab54e 100644
  	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
  	do \
  		if [ -f "$$i" ]; then \
-@@ -636,12 +643,7 @@ install_html_docs:
+@@ -636,12 +643,7 @@
  		done; \
  	done
  
@@ -91,11 +77,10 @@ index 035fa83..5dab54e 100644
  	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
  	here="`pwd`"; \
  	filecase=; \
-diff --git a/Makefile.shared b/Makefile.shared
-index e753f44..8d57163 100644
---- a/Makefile.shared
-+++ b/Makefile.shared
-@@ -105,6 +105,7 @@ LINK_SO=	\
+diff -ru openssl-1.0.2a.orig/Makefile.shared openssl-1.0.2a/Makefile.shared
+--- openssl-1.0.2a.orig/Makefile.shared	2015-01-20 12:33:36.000000000 +0000
++++ openssl-1.0.2a/Makefile.shared	2015-03-19 14:53:31.246908039 +0000
+@@ -105,6 +105,7 @@
      SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
      LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
      LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
@@ -103,7 +88,7 @@ index e753f44..8d57163 100644
      LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
      $${SHAREDCMD} $${SHAREDFLAGS} \
  	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
-@@ -122,6 +123,7 @@ SYMLINK_SO=	\
+@@ -122,6 +123,7 @@
  			done; \
  		fi; \
  		if [ -n "$$SHLIB_SOVER" ]; then \
@@ -111,11 +96,10 @@ index e753f44..8d57163 100644
  			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
  			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
  		fi; \
-diff --git a/crypto/Makefile b/crypto/Makefile
-index 9a39e93..15828ce 100644
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -85,11 +85,11 @@ testapps:
+diff -ru openssl-1.0.2a.orig/crypto/Makefile openssl-1.0.2a/crypto/Makefile
+--- openssl-1.0.2a.orig/crypto/Makefile	2015-03-19 13:31:02.000000000 +0000
++++ openssl-1.0.2a/crypto/Makefile	2015-03-19 14:53:31.246908039 +0000
+@@ -85,11 +85,11 @@
  	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
  
  subdirs:
@@ -129,7 +113,7 @@ index 9a39e93..15828ce 100644
  
  links:
  	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-@@ -100,7 +100,7 @@ links:
+@@ -100,7 +100,7 @@
  # lib: $(LIB): are splitted to avoid end-less loop
  lib:	$(LIB)
  	@touch lib
@@ -138,7 +122,7 @@ index 9a39e93..15828ce 100644
  	$(AR) $(LIB) $(LIBOBJ)
  	test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
  	$(RANLIB) $(LIB) || echo Never mind.
-@@ -111,7 +111,7 @@ shared: buildinf.h lib subdirs
+@@ -111,7 +111,7 @@
  	fi
  
  libs:
@@ -147,7 +131,7 @@ index 9a39e93..15828ce 100644
  
  install:
  	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-@@ -120,7 +120,7 @@ install:
+@@ -120,7 +120,7 @@
  	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
  	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
  	done;
@@ -156,11 +140,10 @@ index 9a39e93..15828ce 100644
  
  lint:
  	@target=lint; $(RECURSIVE_MAKE)
-diff --git a/engines/Makefile b/engines/Makefile
-index da6c875..d675f5c 100644
---- a/engines/Makefile
-+++ b/engines/Makefile
-@@ -72,7 +72,7 @@ top:
+diff -ru openssl-1.0.2a.orig/engines/Makefile openssl-1.0.2a/engines/Makefile
+--- openssl-1.0.2a.orig/engines/Makefile	2015-03-19 13:31:14.000000000 +0000
++++ openssl-1.0.2a/engines/Makefile	2015-03-19 14:53:31.246908039 +0000
+@@ -72,7 +72,7 @@
  
  all:	lib subdirs
  
@@ -169,7 +152,7 @@ index da6c875..d675f5c 100644
  	@if [ -n "$(SHARED_LIBS)" ]; then \
  		set -e; \
  		for l in $(LIBNAMES); do \
-@@ -89,7 +89,7 @@ lib:	$(LIBOBJ)
+@@ -89,7 +89,7 @@
  
  subdirs:
  	echo $(EDIRS)
@@ -178,7 +161,7 @@ index da6c875..d675f5c 100644
  
  files:
  	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-@@ -128,7 +128,7 @@ install:
+@@ -128,7 +128,7 @@
  			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
  		done; \
  	fi
@@ -187,11 +170,10 @@ index da6c875..d675f5c 100644
  
  tags:
  	ctags $(SRC)
-diff --git a/test/Makefile b/test/Makefile
-index bc4a920..58822f8 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -132,7 +132,7 @@ install:
+diff -ru openssl-1.0.2a.orig/test/Makefile openssl-1.0.2a/test/Makefile
+--- openssl-1.0.2a.orig/test/Makefile	2015-03-19 13:31:16.000000000 +0000
++++ openssl-1.0.2a/test/Makefile	2015-03-19 14:55:44.146017128 +0000
+@@ -133,7 +133,7 @@
  tags:
  	ctags $(SRC)
  
@@ -200,7 +182,7 @@ index bc4a920..58822f8 100644
  
  apps:
  	@(cd ..; $(MAKE) DIRS=apps all)
-@@ -398,109 +398,109 @@ BUILD_CMD_STATIC=shlib_target=; \
+@@ -402,121 +402,121 @@
  		link_app.$${shlib_target}
  
  $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
@@ -319,6 +301,10 @@ index bc4a920..58822f8 100644
 -	@target=$(EVPTEST); $(BUILD_CMD)
 +	+@target=$(EVPTEST); $(BUILD_CMD)
  
+ $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
+-	@target=$(EVPEXTRATEST); $(BUILD_CMD)
++	+@target=$(EVPEXTRATEST); $(BUILD_CMD)
+ 
  $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
 -	@target=$(ECDSATEST); $(BUILD_CMD)
 +	+@target=$(ECDSATEST); $(BUILD_CMD)
@@ -344,8 +330,20 @@ index bc4a920..58822f8 100644
 +	+@target=$(SRPTEST); $(BUILD_CMD)
  
  $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
- 	@target=$(V3NAMETEST); $(BUILD_CMD)
-@@ -522,7 +522,7 @@ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
+-	@target=$(V3NAMETEST); $(BUILD_CMD)
++	+@target=$(V3NAMETEST); $(BUILD_CMD)
+ 
+ $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
+-	@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
++	+@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
+ 
+ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
+-	@target=$(CONSTTIMETEST) $(BUILD_CMD)
++	+@target=$(CONSTTIMETEST) $(BUILD_CMD)
+ 
+ #$(AESTEST).o: $(AESTEST).c
+ #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
+@@ -529,7 +529,7 @@
  #	fi
  
  dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
@@ -354,6 +352,3 @@ index bc4a920..58822f8 100644
  
  # DO NOT DELETE THIS LINE -- make depend depends on it.
  
--- 
-2.2.2
-
diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD
index 7e53cc8421..788a6bda7a 100644
--- a/main/openssl/APKBUILD
+++ b/main/openssl/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openssl
-pkgver=1.0.2
+pkgver=1.0.2a
 pkgrel=0
 pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
 url="http://openssl.org"
@@ -116,12 +116,12 @@ libssl() {
 	done
 }
 
-md5sums="38373013fc85c790aabf8837969c5eba  openssl-1.0.2.tar.gz
-db1615f3b629122961da110f9080d522  0001-fix-manpages.patch
+md5sums="a06c547dac9044161a477211049f60ef  openssl-1.0.2a.tar.gz
+0df9ba76033b23ab881216d4f469c81e  0001-fix-manpages.patch
 67bdfe450143a41042d2c318003e963a  0002-busybox-basename.patch
 84c03f201f55ca7fbfde364cfdfc9cf4  0003-use-termios.patch
 451efb6471e55a57064b73bfe6edddee  0004-fix-default-ca-path-for-apps.patch
-845393e180a88d0faf3cb5588d228c1b  0005-fix-parallel-build.patch
+9efaeff0a5246f6ec38189ae249dabbb  0005-fix-parallel-build.patch
 5a5753f52b9f54f769f1ad915d0119bd  0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
 106b2c7590d49a28c782cf3f5d623543  0007-reimplement-c_rehash-in-C.patch
 7a2f9c883ecdfca3087062df4a68150a  0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
@@ -129,12 +129,12 @@ db1615f3b629122961da110f9080d522  0001-fix-manpages.patch
 aa16c89b283faf0fe546e3f897279c44  0010-backport-changes-from-upstream-padlock-module.patch
 57cca845e22c178c3b317010be56edf0  0011-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
 2ac874d1249f5f68d8c7cd58d157d29a  0012-crypto-engine-autoload-padlock-dynamic-engine.patch"
-sha256sums="8c48baf3babe0d505d16cfc0cf272589c66d3624264098213db0fb00034728e9  openssl-1.0.2.tar.gz
-77427264dcdbac4b9aa22557203aa6e49a7b8b8bc9bbb6eb2d1f6f7afeb64efc  0001-fix-manpages.patch
+sha256sums="15b6393c20030aab02c8e2fe0243cb1d1d18062f6c095d67bca91871dc7f324a  openssl-1.0.2a.tar.gz
+4383de0433cb11696346660ae736f120511a7cd0d6ff14543080e0bb93e45ebb  0001-fix-manpages.patch
 b449fb998b5f60a3a1779ac2f432b2c7f08ae52fc6dfa98bca37d735f863d400  0002-busybox-basename.patch
 c3e6a9710726dac72e3eeffd78961d3bae67a480f6bde7890e066547da25cdfd  0003-use-termios.patch
 d438a36b2b0adf342ebef4b5e9793bcdae3b3027061100f660749c322acbe93d  0004-fix-default-ca-path-for-apps.patch
-068f81c138da7987d2f0227c9904b3feb98127a3717bb4e399d4d98d0a77d189  0005-fix-parallel-build.patch
+3ee86d6e2d3e4d21cd6b8b996f8ec033c0c792a32c908a440f39f20f2c026aff  0005-fix-parallel-build.patch
 9baecc8024bd5004ef045c6c53537f7453029c1e273874ce639834145564ca6d  0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
 c934b5d1a2cb58b5235da2dfee423f0f66bb83e1d479f511b444751899637c37  0007-reimplement-c_rehash-in-C.patch
 1030f885dc76f352854a7a95d73e68cfd1479c5f9ee198d6afef6b0755ee1c81  0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
@@ -142,12 +142,12 @@ c934b5d1a2cb58b5235da2dfee423f0f66bb83e1d479f511b444751899637c37  0007-reimpleme
 aee88a24622ce9d71e38deeb874e58435dcf8ff5690f56194f0e4a00fb09b260  0010-backport-changes-from-upstream-padlock-module.patch
 c10b8aaf56a4f4f79ca195fc587e0bb533f643e777d7a3e6fb0350399a6060ea  0011-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
 2f7c850af078a3ae71b2dd38d5d0b3964ea4262e52673e36ff33498cc6223e6c  0012-crypto-engine-autoload-padlock-dynamic-engine.patch"
-sha512sums="dea46225a5445edc4986b02b99fbc90153819374b9a9bfdd892b60cd18ac7fefaf21a7e9d2bb05d0e3bfa4d2704e0ee24b06cc8e7081a542d7598cc9e73c67c5  openssl-1.0.2.tar.gz
-c7a45d92fe1527b00bb8e5731e1a86deb33c08afa9277f24b4996d53a9748b03c78ed9800fd3b7f00cd5718bf23a4717be5bf22d452de4e0b1f2dda4aac7af42  0001-fix-manpages.patch
+sha512sums="02d228578824add52b73433d64697706e6503c2334933fe8dd6b477f59c430977012c3c34da207096229a425e1dcb6f3ae806043894b5ac98c27bbcddb794dd4  openssl-1.0.2a.tar.gz
+b7142256c25f208a42078e2cbdd5165aac833f0453fea0915c63d34d8177e4bb01aeb6676d8cadb988539c181a0d21991bb05a5443580053e75bc8c047b7db17  0001-fix-manpages.patch
 2244f46cb18e6b98f075051dd2446c47f7590abccd108fbab707f168a20cad8d32220d704635973f09e3b2879f523be5160f1ffbc12ab3900f8a8891dc855c5c  0002-busybox-basename.patch
 58e42058a0c8086c49d681b1e226da39a8cf8cb88c51cf739dec2ff12e1bb5d7208ac5033264b186d58e9bdfe992fe9ddb95701d01caf1824396b2cefe30c0a4  0003-use-termios.patch
 82340da695de51a8df9e76289ea1cbb9b3ad2f10d3b793b0d2155ddfce573d497ed1e35e68fdfea8e3b6c1007908698e1a5354041f9567175f2d480920d86f63  0004-fix-default-ca-path-for-apps.patch
-94dc38b340f60ea90b8019aacb0e4982bbf2add83f6131f9082a91c0683bedee5577cee31bd830015f3639055f6d287d5a85fb8d56978955b33546ab91f09398  0005-fix-parallel-build.patch
+93978a0f0cc89403d1dd4a4820e17dce87e6233d376bb1a98db35a77766c4d9dfeef4238c32387f0e1292140dd58d02d31c590f8bf297ae32c13a867efead101  0005-fix-parallel-build.patch
 820d4ce1c222696fe3f1dd0d11815c06262ec230fdb174532fd507286667a0aefbf858ea5edac4245a54b950cd0556545ecd0c5cf494692a2ba131c667e7bcd5  0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
 fc4e383ec85c6543e4e82520904122a5a5601c68042ece1e95a0cae95e02d89174f06f78ba2f8aacae8df16052df6ec628b568519a41706428a3fa07984cc8e3  0007-reimplement-c_rehash-in-C.patch
 17ad683bb91a3a3c5bcc456c8aed7f0b42414c6de06ebafa4753af93c42d9827c9978a43d4d53d741a45df7f7895c6f6163172af57cc7b391cfd15f45ce6c351  0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch