mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-10 08:44:39 +01:00
tools: libressl: update to 4.2.1
Changelog: - 3.8.0: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.8.0-relnotes.txt - 3.8.1: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.8.1-relnotes.txt - 3.8.2: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.8.3-relnotes.txt - 3.8.4: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.8.4-relnotes.txt - 3.9.0: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.9.0-relnotes.txt - 3.9.1: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.9.1-relnotes.txt - 3.9.2: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.9.2-relnotes.txt - 4.0.0: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-4.0.0-relnotes.txt - 4.1.0: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-4.1.0-relnotes.txt - 4.2.0: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-4.2.0-relnotes.txt - 4.2.1: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-4.2.1-relnotes.txt Further add patches: - 010-static.patch - 011-fix-linking.patch Link: https://github.com/openwrt/openwrt/pull/19562 Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Nick Hainke
parent
afb90babed
commit
ef9f45e683
3 changed files with 131 additions and 2 deletions
|
|
@ -8,8 +8,8 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libressl
|
||||
PKG_VERSION:=3.7.3
|
||||
PKG_HASH:=7948c856a90c825bd7268b6f85674a8dcd254bae42e221781b24e3f8dc335db3
|
||||
PKG_VERSION:=4.2.1
|
||||
PKG_HASH:=6d5c2f58583588ea791f4c8645004071d00dfa554a5bf788a006ca1eb5abd70b
|
||||
|
||||
PKG_CPE_ID:=cpe:/a:openbsd:libressl
|
||||
|
||||
|
|
|
|||
99
tools/libressl/patches/010-static.patch
Normal file
99
tools/libressl/patches/010-static.patch
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
--- a/crypto/ec/ec_local.h
|
||||
+++ b/crypto/ec/ec_local.h
|
||||
@@ -253,9 +253,9 @@ struct ec_key_st {
|
||||
int eckey_compute_pubkey(EC_KEY *eckey);
|
||||
int ecdh_compute_key(unsigned char **out, size_t *out_len,
|
||||
const EC_POINT *pub_key, const EC_KEY *ecdh);
|
||||
-int ecdsa_verify(int type, const unsigned char *dgst, int dgst_len,
|
||||
+int libressl_ecdsa_verify(int type, const unsigned char *dgst, int dgst_len,
|
||||
const unsigned char *sigbuf, int sig_len, EC_KEY *eckey);
|
||||
-int ecdsa_verify_sig(const unsigned char *dgst, int dgst_len,
|
||||
+int libressl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len,
|
||||
const ECDSA_SIG *sig, EC_KEY *eckey);
|
||||
|
||||
/*
|
||||
--- a/crypto/ecdsa/ecdsa.c
|
||||
+++ b/crypto/ecdsa/ecdsa.c
|
||||
@@ -217,7 +217,7 @@ ecdsa_prepare_digest(const unsigned char
|
||||
}
|
||||
|
||||
int
|
||||
-ecdsa_sign(int type, const unsigned char *digest, int digest_len,
|
||||
+libressl_ecdsa_sign(int type, const unsigned char *digest, int digest_len,
|
||||
unsigned char *signature, unsigned int *signature_len, const BIGNUM *kinv,
|
||||
const BIGNUM *r, EC_KEY *key)
|
||||
{
|
||||
@@ -266,7 +266,7 @@ LCRYPTO_ALIAS(ECDSA_sign);
|
||||
*/
|
||||
|
||||
int
|
||||
-ecdsa_sign_setup(EC_KEY *key, BN_CTX *in_ctx, BIGNUM **out_kinv, BIGNUM **out_r)
|
||||
+libressl_ecdsa_sign_setup(EC_KEY *key, BN_CTX *in_ctx, BIGNUM **out_kinv, BIGNUM **out_r)
|
||||
{
|
||||
const EC_GROUP *group;
|
||||
EC_POINT *point = NULL;
|
||||
@@ -517,7 +517,7 @@ ecdsa_compute_s(BIGNUM **out_s, const BI
|
||||
*/
|
||||
|
||||
ECDSA_SIG *
|
||||
-ecdsa_sign_sig(const unsigned char *digest, int digest_len,
|
||||
+libressl_ecdsa_sign_sig(const unsigned char *digest, int digest_len,
|
||||
const BIGNUM *in_kinv, const BIGNUM *in_r, EC_KEY *key)
|
||||
{
|
||||
BN_CTX *ctx = NULL;
|
||||
@@ -600,7 +600,7 @@ ECDSA_do_sign(const unsigned char *diges
|
||||
LCRYPTO_ALIAS(ECDSA_do_sign);
|
||||
|
||||
int
|
||||
-ecdsa_verify(int type, const unsigned char *digest, int digest_len,
|
||||
+libressl_ecdsa_verify(int type, const unsigned char *digest, int digest_len,
|
||||
const unsigned char *sigbuf, int sig_len, EC_KEY *key)
|
||||
{
|
||||
ECDSA_SIG *s;
|
||||
@@ -649,7 +649,7 @@ LCRYPTO_ALIAS(ECDSA_verify);
|
||||
*/
|
||||
|
||||
int
|
||||
-ecdsa_verify_sig(const unsigned char *digest, int digest_len,
|
||||
+libressl_ecdsa_verify_sig(const unsigned char *digest, int digest_len,
|
||||
const ECDSA_SIG *sig, EC_KEY *key)
|
||||
{
|
||||
const EC_GROUP *group;
|
||||
--- a/crypto/ecdsa/ecdsa_local.h
|
||||
+++ b/crypto/ecdsa/ecdsa_local.h
|
||||
@@ -68,12 +68,12 @@ struct ECDSA_SIG_st {
|
||||
BIGNUM *s;
|
||||
};
|
||||
|
||||
-int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *in_ctx, BIGNUM **out_kinv,
|
||||
+int libressl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *in_ctx, BIGNUM **out_kinv,
|
||||
BIGNUM **out_r);
|
||||
-int ecdsa_sign(int type, const unsigned char *digest, int digest_len,
|
||||
+int libressl_ecdsa_sign(int type, const unsigned char *digest, int digest_len,
|
||||
unsigned char *signature, unsigned int *signature_len, const BIGNUM *kinv,
|
||||
const BIGNUM *r, EC_KEY *eckey);
|
||||
-ECDSA_SIG *ecdsa_sign_sig(const unsigned char *digest, int digest_len,
|
||||
+ECDSA_SIG *libressl_ecdsa_sign_sig(const unsigned char *digest, int digest_len,
|
||||
const BIGNUM *in_kinv, const BIGNUM *in_r, EC_KEY *eckey);
|
||||
|
||||
__END_HIDDEN_DECLS
|
||||
--- a/crypto/ec/ec_key.c
|
||||
+++ b/crypto/ec/ec_key.c
|
||||
@@ -774,12 +774,12 @@ static const EC_KEY_METHOD openssl_ec_ke
|
||||
.keygen = ec_key_gen,
|
||||
.compute_key = ecdh_compute_key,
|
||||
|
||||
- .sign = ecdsa_sign,
|
||||
- .sign_setup = ecdsa_sign_setup,
|
||||
- .sign_sig = ecdsa_sign_sig,
|
||||
+ .sign = libressl_ecdsa_sign,
|
||||
+ .sign_setup = libressl_ecdsa_sign_setup,
|
||||
+ .sign_sig = libressl_ecdsa_sign_sig,
|
||||
|
||||
- .verify = ecdsa_verify,
|
||||
- .verify_sig = ecdsa_verify_sig,
|
||||
+ .verify = libressl_ecdsa_verify,
|
||||
+ .verify_sig = libressl_ecdsa_verify_sig,
|
||||
};
|
||||
|
||||
const EC_KEY_METHOD *
|
||||
30
tools/libressl/patches/011-fix-linking.patch
Normal file
30
tools/libressl/patches/011-fix-linking.patch
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
--- a/libcrypto.pc.in
|
||||
+++ b/libcrypto.pc.in
|
||||
@@ -23,6 +23,5 @@ includedir=@includedir@
|
||||
Name: LibreSSL-libcrypto
|
||||
Description: LibreSSL cryptography library
|
||||
Version: @VERSION@
|
||||
-Libs: -L${libdir} -lcrypto
|
||||
-Libs.private: @LIBS@ @PLATFORM_LDADD@
|
||||
+Libs: -L${libdir} -lcrypto @LIBS@ @PLATFORM_LDADD@
|
||||
Cflags: -I${includedir}
|
||||
--- a/libssl.pc.in
|
||||
+++ b/libssl.pc.in
|
||||
@@ -23,6 +23,6 @@ includedir=@includedir@
|
||||
Name: LibreSSL-libssl
|
||||
Description: Secure Sockets Layer and cryptography libraries
|
||||
Version: @VERSION@
|
||||
-Requires.private: libcrypto
|
||||
+Requires: libcrypto
|
||||
Libs: -L${libdir} -lssl
|
||||
Cflags: -I${includedir}
|
||||
--- a/libtls.pc.in
|
||||
+++ b/libtls.pc.in
|
||||
@@ -23,6 +23,5 @@ includedir=@includedir@
|
||||
Name: LibreSSL-libtls
|
||||
Description: Secure communications using the TLS socket protocol.
|
||||
Version: @VERSION@
|
||||
-Libs: -L${libdir} -ltls
|
||||
-Libs.private: @LIBS@ @PLATFORM_LDADD@ -lssl -lcrypto
|
||||
+Libs: -L${libdir} -ltls @LIBS@ @PLATFORM_LDADD@ -lssl -lcrypto
|
||||
Cflags: -I${includedir}
|
||||
Loading…
Add table
Reference in a new issue