1.0.2g

3 files changed, 12 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d8d0fba39404..c52f1bd18f19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Mar  1 03:05:39 UTC 2016
+# Thu Mar  3 07:24:34 UTC 2016
 pkgbase = lib32-openssl-chacha20
 	pkgdesc = The Open Source toolkit for Secure Sockets Layer and Transport Layer Security with ChaCha20 support (32-bit)
-	pkgver = 1.0.2.f
-	pkgrel = 2
+	pkgver = 1.0.2.g
+	pkgrel = 0
 	url = https://www.openssl.org
 	arch = x86_64
 	license = custom:BSD
@@ -11,19 +11,19 @@ pkgbase = lib32-openssl-chacha20
 	depends = lib32-zlib
 	depends = openssl
 	optdepends = ca-certificates
-	provides = lib32-openssl=1.0.2.f
+	provides = lib32-openssl=1.0.2.g
 	conflicts = lib32-openssl
 	options = !makeflags
-	source = https://www.openssl.org/source/openssl-1.0.2f.tar.gz
-	source = https://www.openssl.org/source/openssl-1.0.2f.tar.gz.asc
+	source = https://www.openssl.org/source/openssl-1.0.2g.tar.gz
+	source = https://www.openssl.org/source/openssl-1.0.2g.tar.gz.asc
 	source = no-rpath.patch
 	source = ca-dir.patch
 	source = openssl__chacha20_poly1305_draft_and_rfc_ossl102f.patch
-	md5sums = b3bf73f507172be9292ea2a8c28b659d
+	md5sums = f3c710c045cdee5fd114feb69feba7aa
 	md5sums = SKIP
 	md5sums = dc78d3d06baffc16217519242ce92478
 	md5sums = 3bf51be3a1bbd262be46dc619f92aa90
-	md5sums = 3ea48304c41f09f07e732887e5520042
+	md5sums = b419f4870c0cf3eb4acf337cc80be28d
 
 pkgname = lib32-openssl-chacha20
 
diff --git a/PKGBUILD b/PKGBUILD
index eb410f800351..df1f12b6d029 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 
 _pkgbasename=openssl
 pkgname=lib32-$_pkgbasename-chacha20
-_ver=1.0.2f
+_ver=1.0.2g
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=2
+pkgrel=0
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security with ChaCha20 support (32-bit)'
 arch=('x86_64')
 url='https://www.openssl.org'
@@ -23,11 +23,11 @@ source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"
         'ca-dir.patch'
         'openssl__chacha20_poly1305_draft_and_rfc_ossl102f.patch')
 validpgpkeys=(8657ABB260F056B1E5190839D9C4D26D0E604491)
-md5sums=('b3bf73f507172be9292ea2a8c28b659d'
+md5sums=('f3c710c045cdee5fd114feb69feba7aa'
          'SKIP'
          'dc78d3d06baffc16217519242ce92478'
          '3bf51be3a1bbd262be46dc619f92aa90'
-         '3ea48304c41f09f07e732887e5520042')
+         'b419f4870c0cf3eb4acf337cc80be28d')
 
 prepare() {
 	cd $srcdir/$_pkgbasename-$_ver
diff --git a/openssl__chacha20_poly1305_draft_and_rfc_ossl102f.patch b/openssl__chacha20_poly1305_draft_and_rfc_ossl102f.patch
index cff8043b9c85..c69ebffcf015 100644
--- a/openssl__chacha20_poly1305_draft_and_rfc_ossl102f.patch
+++ b/openssl__chacha20_poly1305_draft_and_rfc_ossl102f.patch
@@ -27,7 +27,6 @@ Subject: [PATCH] Implementation of draft and RFC versions of CHACHA20-POLY1305
  ssl/ssl_ciph.c                               |  60 +-
  ssl/ssl_locl.h                               |   2 +
  ssl/tls1.h                                   |  28 +
- test/Makefile                                |  17 +-
  23 files changed, 4655 insertions(+), 54 deletions(-)
  create mode 100644 crypto/chacha20poly1305/Makefile
  create mode 100644 crypto/chacha20poly1305/asm/chacha20_avx.pl
@@ -5145,83 +5144,6 @@ index 7e237d0..fb0c981 100644
  # define TLS_CT_RSA_SIGN                 1
  # define TLS_CT_DSS_SIGN                 2
  # define TLS_CT_RSA_FIXED_DH             3
-diff --git a/test/Makefile b/test/Makefile
-index b180971..554d536 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -70,6 +70,7 @@ HEARTBEATTEST=  heartbeat_test
- CONSTTIMETEST=  constant_time_test
- VERIFYEXTRATEST=	verify_extra_test
- CLIENTHELLOTEST=	clienthellotest
-+CHAPOLYTEST=	chapolytest
- 
- TESTS=		alltests
- 
-@@ -83,7 +84,7 @@ EXE=	$(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT)  $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)
- 	$(EVPTEST)$(EXE_EXT) $(EVPEXTRATEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) $(SRPTEST)$(EXE_EXT) \
- 	$(ASN1TEST)$(EXE_EXT) $(V3NAMETEST)$(EXE_EXT) $(HEARTBEATTEST)$(EXE_EXT) \
- 	$(CONSTTIMETEST)$(EXE_EXT) $(VERIFYEXTRATEST)$(EXE_EXT) \
--	$(CLIENTHELLOTEST)$(EXE_EXT)
-+	$(CLIENTHELLOTEST)$(EXE_EXT) $(CHAPOLYTEST)$(EXE_EXT)
- 
- # $(METHTEST)$(EXE_EXT)
- 
-@@ -97,7 +98,7 @@ OBJ=	$(BNTEST).o $(ECTEST).o  $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \
- 	$(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o $(RSATEST).o \
- 	$(EVPTEST).o $(EVPEXTRATEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o $(V3NAMETEST).o \
- 	$(HEARTBEATTEST).o $(CONSTTIMETEST).o $(VERIFYEXTRATEST).o \
--	$(CLIENTHELLOTEST).o
-+	$(CLIENTHELLOTEST).o $(CHAPOLYTEST).o
- 
- SRC=	$(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
- 	$(MD2TEST).c  $(MD4TEST).c $(MD5TEST).c \
-@@ -108,7 +109,7 @@ SRC=	$(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
- 	$(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c $(RSATEST).c \
- 	$(EVPTEST).c $(EVPEXTRATEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c \
- 	$(V3NAMETEST).c $(HEARTBEATTEST).c $(CONSTTIMETEST).c $(VERIFYEXTRATEST).c \
--	$(CLIENTHELLOTEST).c
-+	$(CLIENTHELLOTEST).c $(CHAPOLYTEST).c
- 
- EXHEADER= 
- HEADER=	testutil.h $(EXHEADER)
-@@ -144,7 +145,7 @@ apps:
- 	@(cd ..; $(MAKE) DIRS=apps all)
- 
- alltests: \
--	test_des test_idea test_sha test_md4 test_md5 test_hmac \
-+	test_des test_idea test_sha test_md4 test_md5 test_hmac test_chapoly \
- 	test_md2 test_mdc2 test_wp \
- 	test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \
- 	test_rand test_bn test_ec test_ecdsa test_ecdh \
-@@ -361,6 +362,10 @@ test_clienthello: $(CLIENTHELLOTEST)$(EXE_EXT)
- 	@echo $(START) $@
- 	../util/shlib_wrap.sh ./$(CLIENTHELLOTEST)
- 
-+test_chapoly: $(CHAPOLYTEST)$(EXE_EXT)
-+	@echo "Test ChaCha20 and Poly1305"
-+	../util/shlib_wrap.sh ./$(CHAPOLYTEST)
-+
- lint:
- 	lint -DLINT $(INCLUDES) $(SRC)>fluff
- 
-@@ -538,6 +543,9 @@ $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
- $(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o
- 	@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
- 
-+$(CHAPOLYTEST)$(EXE_EXT): $(CHAPOLYTEST).o
-+	@target=$(CHAPOLYTEST); $(BUILD_CMD)
-+
- #$(AESTEST).o: $(AESTEST).c
- #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
- 
-@@ -606,6 +614,7 @@ clienthellotest.o: clienthellotest.c
- constant_time_test.o: ../crypto/constant_time_locl.h ../e_os.h
- constant_time_test.o: ../include/openssl/e_os2.h
- constant_time_test.o: ../include/openssl/opensslconf.h constant_time_test.c
-+chapolytest.o: ../include/openssl/chacha20poly1305.h chapolytest.c
- destest.o: ../include/openssl/des.h ../include/openssl/des_old.h
- destest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
- destest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
 -- 
 2.5.0