Move local LibreSSL fixes to long overdue PR

This commit is contained in:
kn 2022-12-23 10:16:13 +00:00
parent 5c8173134b
commit a0685334f6
4 changed files with 4 additions and 46 deletions

View File

@ -3,6 +3,7 @@ COMMENT = library for creating DigiDoc signature files
V = 3.14.11
DISTNAME = libdigidocpp-${V}
CATEGORIES = security
REVISION = 0
SHARED_LIBS = digidocpp 1.0 # 0.0
@ -20,6 +21,7 @@ MASTER_SITES0 = https://github.com/open-eid/libdigidocpp/
# still pending (but approved)
PATCHFILES += iconv-{pull/}470.patch:0
PATCHFILES += update-minzip-{pull/}515.patch:0
PATCHFILES += libressl-{pull/}516.patch:0
PATCH_DIST_STRIP = -p1

View File

@ -1,6 +1,8 @@
SHA256 (libdigidocpp/iconv-470.patch) = WqRjWdR6Vg4sl8KfU5SB1UI9q8mx28JV3Rb2JxnFyio=
SHA256 (libdigidocpp/libdigidocpp-3.14.11.tar.gz) = 5QYKHwRB5nck5yqukX/UA+M3jFlBvkQ/ekB7JFIY5tI=
SHA256 (libdigidocpp/libressl-516.patch) = kpLP1m/cjzXqDQ7zJ8lGhtH+Q3rOVwa9DqVLEw95eQ0=
SHA256 (libdigidocpp/update-minzip-515.patch) = 1sHde6q0P2ckSOuXrlFriE8pspeG2I5esBiTXx/fyBE=
SIZE (libdigidocpp/iconv-470.patch) = 1410
SIZE (libdigidocpp/libdigidocpp-3.14.11.tar.gz) = 2642208
SIZE (libdigidocpp/libressl-516.patch) = 1852
SIZE (libdigidocpp/update-minzip-515.patch) = 23022

View File

@ -1,27 +0,0 @@
Index: src/crypto/TS.cpp
--- src/crypto/TS.cpp.orig
+++ src/crypto/TS.cpp
@@ -53,23 +53,6 @@ void *OPENSSL_memdup(const void *data, size_t size)
return memcpy(copy, data, size);
}
-
-static void TS_VERIFY_CTX_set_flags(TS_VERIFY_CTX *ctx, int f)
-{
- ctx->flags = unsigned(f);
-}
-
-static void TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx, unsigned char *hexstr, long len)
-{
- OPENSSL_free(ctx->imprint);
- ctx->imprint = hexstr;
- ctx->imprint_len = unsigned(len);
-}
-
-static void TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *s)
-{
- ctx->store = s;
-}
#endif
TS::TS(const string &url, const Digest &digest, const string &useragent)

View File

@ -1,19 +0,0 @@
Index: src/crypto/X509Crypto.cpp
--- src/crypto/X509Crypto.cpp.orig
+++ src/crypto/X509Crypto.cpp
@@ -37,7 +37,6 @@
using namespace digidoc;
using namespace std;
-#ifndef LIBRESSL_VERSION_NUMBER
/*-
* IssuerSerial ::= SEQUENCE {
* issuer GeneralNames,
@@ -48,7 +47,6 @@ using ESS_ISSUER_SERIAL = struct ESS_issuer_serial {
GENERAL_NAMES *issuer;
ASN1_INTEGER *serial;
};
-#endif
/**
* Initialize RSA crypter.