Adrian Schröter 2017-04-18 11:43:17 +00:00 committed by Git OBS Bridge
parent b4b0368c56
commit a6ec62ff8a
2 changed files with 1 additions and 64 deletions

View File

@ -1,64 +0,0 @@
Index: libarchive/archive_digest.c
===================================================================
--- libarchive/archive_digest.c.orig
+++ libarchive/archive_digest.c
@@ -207,6 +207,7 @@ __archive_nettle_md5final(archive_md5_ct
static int
__archive_openssl_md5init(archive_md5_ctx *ctx)
{
+ OPENSSL_config(NULL);
EVP_DigestInit(ctx, EVP_md5());
return (ARCHIVE_OK);
}
@@ -359,6 +360,7 @@ __archive_nettle_ripemd160final(archive_
static int
__archive_openssl_ripemd160init(archive_rmd160_ctx *ctx)
{
+ OPENSSL_config(NULL);
EVP_DigestInit(ctx, EVP_ripemd160());
return (ARCHIVE_OK);
}
@@ -509,6 +511,7 @@ __archive_nettle_sha1final(archive_sha1_
static int
__archive_openssl_sha1init(archive_sha1_ctx *ctx)
{
+ OPENSSL_config(NULL);
EVP_DigestInit(ctx, EVP_sha1());
return (ARCHIVE_OK);
}
@@ -733,6 +736,7 @@ __archive_nettle_sha256final(archive_sha
static int
__archive_openssl_sha256init(archive_sha256_ctx *ctx)
{
+ OPENSSL_config(NULL);
EVP_DigestInit(ctx, EVP_sha256());
return (ARCHIVE_OK);
}
@@ -928,6 +932,7 @@ __archive_nettle_sha384final(archive_sha
static int
__archive_openssl_sha384init(archive_sha384_ctx *ctx)
{
+ OPENSSL_config(NULL);
EVP_DigestInit(ctx, EVP_sha384());
return (ARCHIVE_OK);
}
@@ -1147,6 +1152,7 @@ __archive_nettle_sha512final(archive_sha
static int
__archive_openssl_sha512init(archive_sha512_ctx *ctx)
{
+ OPENSSL_config(NULL);
EVP_DigestInit(ctx, EVP_sha512());
return (ARCHIVE_OK);
}
Index: libarchive/archive_cryptor_private.h
===================================================================
--- libarchive/archive_cryptor_private.h.orig
+++ libarchive/archive_cryptor_private.h
@@ -100,6 +100,7 @@ typedef struct {
#elif defined(HAVE_LIBCRYPTO)
#include <openssl/evp.h>
+#include <openssl/conf.h>
#define AES_BLOCK_SIZE 16
#define AES_MAX_KEY_SIZE 32

View File

@ -4,6 +4,7 @@ Mon Apr 3 14:44:27 UTC 2017 - adrian@suse.de
- update to version 3.3.1 - update to version 3.3.1
* Security & Feature release * Security & Feature release
Details are not documented from upstream yet Details are not documented from upstream yet
fix-extract-over-links.patch and libarchive-openssl.patch obsoleted
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 2 13:37:54 UTC 2016 - adrian@suse.com Fri Dec 2 13:37:54 UTC 2016 - adrian@suse.com