From e2a2673873e4364ea669439cbe58f478bc3a3b64 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 21 Jan 2020 15:38:48 +0300 Subject: Release version 1.1.1+9 Enable zlib usage Don't define default directory paths Fix 'sslv3 alert bad record mac' failure for some libcrypto function calls --- libssl/libssl/buildfile | 9 +++++++++ libssl/manifest | 2 +- libssl/tests/basic/driver.c | 3 +-- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'libssl') diff --git a/libssl/libssl/buildfile b/libssl/libssl/buildfile index 6b41c17..7be45fe 100644 --- a/libssl/libssl/buildfile +++ b/libssl/libssl/buildfile @@ -11,6 +11,15 @@ tsys = $c.target.system # Build options. # +# Note that libssl doesn't use zlib directly. However, it may use +# functionality that libcrypto additionally provides when zlib is enabled. +# +# Also note that upstream also passes -DNDEBUG. Let's omit it for now to +# enable assertions to gain some extra confidence that we didn't break +# anything while packaging. +# +c.poptions += -DZLIB + # Drop -DOPENSSL_PIC, -D{L|B}_ENDIAN, -DOPENSSLDIR and -DENGINESDIR as they # are not used in the libssl source code nor in the libcrypto public headers. # diff --git a/libssl/manifest b/libssl/manifest index 412b39b..f685ac7 100644 --- a/libssl/manifest +++ b/libssl/manifest @@ -3,7 +3,7 @@ name: libssl # Note: remember to update doc-url below! # -version: 1.1.1+8 +version: 1.1.1+9 upstream-version: 1.1.1d project: openssl diff --git a/libssl/tests/basic/driver.c b/libssl/tests/basic/driver.c index 56e9c5f..8f526e6 100644 --- a/libssl/tests/basic/driver.c +++ b/libssl/tests/basic/driver.c @@ -1,5 +1,4 @@ -/* - * file : tests/basic/driver.c +/* file : tests/basic/driver.c * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file */ -- cgit v1.1