Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

libressl: Update to 2.9.0

Browse Source
This commit is contained in:
Alexey Pavlov
2019-03-12 14:51:34 +03:00
parent 458f2ee3c6
commit 75ee79a296
2 changed files with 59 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
mingw-w64-libressl/0001-libressl_relocation-msys.patch
View File

@@ -293,7 +293,7 @@ index 046a623..cf5ee9e 100644
endif
noinst_LTLIBRARIES = libcompat.la
@@ -189,35 +189,35 @@
@@ -189,43 +189,43 @@
include Makefile.am.arc4random
@@ -302,9 +302,11 @@ index 046a623..cf5ee9e 100644
+liblibrecrypto_la_SOURCES =
+EXTRA_liblibrecrypto_la_SOURCES =
include Makefile.am.elf-arm
include Makefile.am.elf-x86_64
include Makefile.am.macosx-x86_64
if !HOST_ASM_ELF_ARM
if !HOST_ASM_ELF_X86_64
if !HOST_ASM_MACOSX_X86_64
-libcrypto_la_SOURCES += aes/aes_cbc.c
@@ -323,10 +325,18 @@ index 046a623..cf5ee9e 100644
+liblibrecrypto_la_SOURCES += whrlpool/wp_block.c
endif
endif
endif
-libcrypto_la_SOURCES += cpt_err.c
-libcrypto_la_SOURCES += cryptlib.c
-libcrypto_la_SOURCES += crypto_init.c
if !HOST_WIN
-libcrypto_la_SOURCES += crypto_lock.c
+liblibrecrypto_la_SOURCES += crypto_lock.c
else
-libcrypto_la_SOURCES += crypto_lock_win.c
+liblibrecrypto_la_SOURCES += crypto_lock_win.c
endif
-libcrypto_la_SOURCES += cversion.c
-libcrypto_la_SOURCES += ex_data.c
-libcrypto_la_SOURCES += malloc-wrapper.c
@@ -349,7 +359,7 @@ index 046a623..cf5ee9e 100644
noinst_HEADERS += constant_time_locl.h
noinst_HEADERS += cryptlib.h
noinst_HEADERS += md32_common.h
@@ -225,685 +225,685 @@
@@ -225,688 +225,688 @@
noinst_HEADERS += x86_arch.h
# aes
@@ -372,7 +382,6 @@ index 046a623..cf5ee9e 100644
# asn1
-libcrypto_la_SOURCES += asn1/a_bitstr.c
-libcrypto_la_SOURCES += asn1/a_bool.c
-libcrypto_la_SOURCES += asn1/a_bytes.c
-libcrypto_la_SOURCES += asn1/a_d2i_fp.c
-libcrypto_la_SOURCES += asn1/a_digest.c
-libcrypto_la_SOURCES += asn1/a_dup.c
@@ -383,7 +392,6 @@ index 046a623..cf5ee9e 100644
-libcrypto_la_SOURCES += asn1/a_object.c
-libcrypto_la_SOURCES += asn1/a_octet.c
-libcrypto_la_SOURCES += asn1/a_print.c
-libcrypto_la_SOURCES += asn1/a_set.c
-libcrypto_la_SOURCES += asn1/a_sign.c
-libcrypto_la_SOURCES += asn1/a_strex.c
-libcrypto_la_SOURCES += asn1/a_strnid.c
@@ -448,7 +456,6 @@ index 046a623..cf5ee9e 100644
-libcrypto_la_SOURCES += asn1/x_x509a.c
+liblibrecrypto_la_SOURCES += asn1/a_bitstr.c
+liblibrecrypto_la_SOURCES += asn1/a_bool.c
+liblibrecrypto_la_SOURCES += asn1/a_bytes.c
+liblibrecrypto_la_SOURCES += asn1/a_d2i_fp.c
+liblibrecrypto_la_SOURCES += asn1/a_digest.c
+liblibrecrypto_la_SOURCES += asn1/a_dup.c
@@ -459,7 +466,6 @@ index 046a623..cf5ee9e 100644
+liblibrecrypto_la_SOURCES += asn1/a_object.c
+liblibrecrypto_la_SOURCES += asn1/a_octet.c
+liblibrecrypto_la_SOURCES += asn1/a_print.c
+liblibrecrypto_la_SOURCES += asn1/a_set.c
+liblibrecrypto_la_SOURCES += asn1/a_sign.c
+liblibrecrypto_la_SOURCES += asn1/a_strex.c
+liblibrecrypto_la_SOURCES += asn1/a_strnid.c
@@ -1017,6 +1023,7 @@ index 046a623..cf5ee9e 100644
-libcrypto_la_SOURCES += evp/m_sha1.c
-libcrypto_la_SOURCES += evp/m_sigver.c
-libcrypto_la_SOURCES += evp/m_streebog.c
-libcrypto_la_SOURCES += evp/m_sm3.c
-libcrypto_la_SOURCES += evp/m_wp.c
-libcrypto_la_SOURCES += evp/names.c
-libcrypto_la_SOURCES += evp/p5_crpt.c
@@ -1074,6 +1081,7 @@ index 046a623..cf5ee9e 100644
+liblibrecrypto_la_SOURCES += evp/m_sha1.c
+liblibrecrypto_la_SOURCES += evp/m_sigver.c
+liblibrecrypto_la_SOURCES += evp/m_streebog.c
+liblibrecrypto_la_SOURCES += evp/m_sm3.c
+liblibrecrypto_la_SOURCES += evp/m_wp.c
+liblibrecrypto_la_SOURCES += evp/names.c
+liblibrecrypto_la_SOURCES += evp/p5_crpt.c
@@ -1387,6 +1395,11 @@ index 046a623..cf5ee9e 100644
+liblibrecrypto_la_SOURCES += sha/sha512.c
noinst_HEADERS += sha/sha_locl.h
# sm3
-libcrypto_la_SOURCES += sm3/sm3.c
+liblibrecrypto_la_SOURCES += sm3/sm3.c
noinst_HEADERS += sm3/sm3_locl.h
# stack
-libcrypto_la_SOURCES += stack/stack.c
+liblibrecrypto_la_SOURCES += stack/stack.c
@@ -1566,6 +1579,33 @@ index 046a623..cf5ee9e 100644
+liblibrecrypto_la_SOURCES += x509v3/v3err.c
noinst_HEADERS += x509v3/ext_dat.h
noinst_HEADERS += x509v3/pcy_int.h
diff --git a/crypto/Makefile.am.elf-arm b/crypto/Makefile.am.elf-arm
index 4cd34e2..1d7e022 100644
--- a/crypto/Makefile.am.elf-arm 2019-03-12 10:59:50.795167900 +0300
+++ b/crypto/Makefile.am.elf-arm 2019-03-12 11:00:05.272993400 +0300
@@ -18,13 +18,13 @@
EXTRA_DIST += $(ASM_ARM_ELF)
if HOST_ASM_ELF_ARM
-libcrypto_la_CPPFLAGS += -DAES_ASM
-libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
-libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_GF2m
-libcrypto_la_CPPFLAGS += -DGHASH_ASM
-libcrypto_la_CPPFLAGS += -DSHA1_ASM
-libcrypto_la_CPPFLAGS += -DSHA256_ASM
-libcrypto_la_CPPFLAGS += -DSHA512_ASM
-libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ
-libcrypto_la_SOURCES += $(ASM_ARM_ELF)
+liblibrecrypto_la_CPPFLAGS += -DAES_ASM
+liblibrecrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
+liblibrecrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_GF2m
+liblibrecrypto_la_CPPFLAGS += -DGHASH_ASM
+liblibrecrypto_la_CPPFLAGS += -DSHA1_ASM
+liblibrecrypto_la_CPPFLAGS += -DSHA256_ASM
+liblibrecrypto_la_CPPFLAGS += -DSHA512_ASM
+liblibrecrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ
+liblibrecrypto_la_SOURCES += $(ASM_ARM_ELF)
endif
diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64
index 4cd34e2..1d7e022 100644
--- a/crypto/Makefile.am.elf-x86_64
@@ -1759,7 +1799,6 @@ index 3c348d3..aaddbf6 100644
-libssl_la_SOURCES += d1_clnt.c
-libssl_la_SOURCES += d1_enc.c
-libssl_la_SOURCES += d1_lib.c
-libssl_la_SOURCES += d1_meth.c
-libssl_la_SOURCES += d1_pkt.c
-libssl_la_SOURCES += d1_srtp.c
-libssl_la_SOURCES += d1_srvr.c
@@ -1775,21 +1814,22 @@ index 3c348d3..aaddbf6 100644
-libssl_la_SOURCES += ssl_err.c
-libssl_la_SOURCES += ssl_init.c
-libssl_la_SOURCES += ssl_lib.c
-libssl_la_SOURCES += ssl_methods.c
-libssl_la_SOURCES += ssl_packet.c
-libssl_la_SOURCES += ssl_pkt.c
-libssl_la_SOURCES += ssl_rsa.c
-libssl_la_SOURCES += ssl_sess.c
-libssl_la_SOURCES += ssl_sigalgs.c
-libssl_la_SOURCES += ssl_srvr.c
-libssl_la_SOURCES += ssl_stat.c
-libssl_la_SOURCES += ssl_tlsext.c
-libssl_la_SOURCES += ssl_txt.c
-libssl_la_SOURCES += ssl_versions.c
-libssl_la_SOURCES += t1_clnt.c
-libssl_la_SOURCES += t1_enc.c
-libssl_la_SOURCES += t1_hash.c
-libssl_la_SOURCES += t1_lib.c
-libssl_la_SOURCES += t1_meth.c
-libssl_la_SOURCES += t1_srvr.c
-libssl_la_SOURCES += tls13_handshake.c
-libssl_la_SOURCES += tls13_key_schedule.c
+liblibressl_la_SOURCES = bio_ssl.c
+liblibressl_la_SOURCES += bs_ber.c
+liblibressl_la_SOURCES += bs_cbb.c
@@ -1798,7 +1838,6 @@ index 3c348d3..aaddbf6 100644
+liblibressl_la_SOURCES += d1_clnt.c
+liblibressl_la_SOURCES += d1_enc.c
+liblibressl_la_SOURCES += d1_lib.c
+liblibressl_la_SOURCES += d1_meth.c
+liblibressl_la_SOURCES += d1_pkt.c
+liblibressl_la_SOURCES += d1_srtp.c
+liblibressl_la_SOURCES += d1_srvr.c
@@ -1814,24 +1853,25 @@ index 3c348d3..aaddbf6 100644
+liblibressl_la_SOURCES += ssl_err.c
+liblibressl_la_SOURCES += ssl_init.c
+liblibressl_la_SOURCES += ssl_lib.c
+liblibressl_la_SOURCES += ssl_methods.c
+liblibressl_la_SOURCES += ssl_packet.c
+liblibressl_la_SOURCES += ssl_pkt.c
+liblibressl_la_SOURCES += ssl_rsa.c
+liblibressl_la_SOURCES += ssl_sess.c
+liblibressl_la_SOURCES += ssl_sigalgs.c
+liblibressl_la_SOURCES += ssl_srvr.c
+liblibressl_la_SOURCES += ssl_stat.c
+liblibressl_la_SOURCES += ssl_tlsext.c
+liblibressl_la_SOURCES += ssl_txt.c
+liblibressl_la_SOURCES += ssl_versions.c
+liblibressl_la_SOURCES += t1_clnt.c
+liblibressl_la_SOURCES += t1_enc.c
+liblibressl_la_SOURCES += t1_hash.c
+liblibressl_la_SOURCES += t1_lib.c
+liblibressl_la_SOURCES += t1_meth.c
+liblibressl_la_SOURCES += t1_srvr.c
+liblibressl_la_SOURCES += tls13_handshake.c
+liblibressl_la_SOURCES += tls13_key_schedule.c
noinst_HEADERS = srtp.h
noinst_HEADERS += ssl_locl.h
noinst_HEADERS = bytestring.h
noinst_HEADERS += srtp.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 624e597..6cbbd72 100644
--- a/tests/Makefile.am

6
mingw-w64-libressl/PKGBUILD
View File

@@ -3,7 +3,7 @@
_realname=libressl
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2.8.2
pkgver=2.9.0
pkgrel=1
pkgdesc="LibreSSL Encryption (mingw-w64)"
arch=('any')
@@ -15,8 +15,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
source=("https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${_realname}-${pkgver}.tar.gz"
"0001-libressl_relocation-msys.patch"
"0002-libressl_relocation-tests.patch")
sha256sums=('b8cb31e59f1294557bfc80f2a662969bc064e83006ceef0574e2553a1c254fd5'
'fe8ec69671922862c0d57dae902c8fe4d07a6d599a694ec903e58396fa964bb1'
sha256sums=('eb5f298408b723f11a0ca0192c122ecb79b4855bfdf7eea183a6264296a13cf4'
'fe5fc36ff34abcf34b1aefd3bb26e926ba7b664bfb6e4188e1cf18f4965ea8d1'
'06500c7f09c2067b17e00d9fa4feb6aec922b8525f710a0dea43bd873a5f447b')
prepare() {