diff options
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/manifest | 2 | ||||
| -rw-r--r-- | openssl/openssl/buildfile | 9 | ||||
| -rw-r--r-- | openssl/tests/encryption.testscript | 9 | ||||
| -rw-r--r-- | openssl/tests/version.testscript | 6 |
4 files changed, 22 insertions, 4 deletions
diff --git a/openssl/manifest b/openssl/manifest index 6b30ea6..a90ba1e 100644 --- a/openssl/manifest +++ b/openssl/manifest @@ -3,7 +3,7 @@ name: openssl # Note: remember to update doc-url below! # -version: 1.1.1+8 +version: 1.1.1+9 upstream-version: 1.1.1d priority: security diff --git a/openssl/openssl/buildfile b/openssl/openssl/buildfile index f9e317a..8cc2107 100644 --- a/openssl/openssl/buildfile +++ b/openssl/openssl/buildfile @@ -16,6 +16,15 @@ exe{openssl}: apps/c{win32_init}: include = $windows # Build options. # +# Note that openssl doesn't use zlib directly. However, it uses functionality +# that libcrypto additionally provide 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 + # Note that the upstream package uses -pthread compiler/linker option on # Linux and FreeBSD. The option is currently unsupported by build2, so we use # -D_REENTRANT and -lpthread preprocessor/linker options instead. diff --git a/openssl/tests/encryption.testscript b/openssl/tests/encryption.testscript new file mode 100644 index 0000000..6326858 --- /dev/null +++ b/openssl/tests/encryption.testscript @@ -0,0 +1,9 @@ +# file : tests/encryption.testscript +# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd +# license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file + +enc = $* aes-256-cbc -e -salt -base64 -md sha256 -pass pass:123 -pbkdf2 +dec = $* aes-256-cbc -d -salt -base64 -md sha256 -pass pass:123 -pbkdf2 + +$enc <'ABC' | $dec >'ABC' : no-zlib +$enc -z <'ABC' | $dec -z >'ABC' : zlib diff --git a/openssl/tests/version.testscript b/openssl/tests/version.testscript index 1759e5f..325ba9b 100644 --- a/openssl/tests/version.testscript +++ b/openssl/tests/version.testscript @@ -7,8 +7,8 @@ $* version -a >>~"%EOO%" %built on: .+ UTC% %platform: $c.target.class-$c.target.cpu% %options: .+% - %compiler: $c.class .*-DLIBCRYPTO_BUILD.*% - %OPENSSLDIR: ".+"% - %ENGINESDIR: ".+"% + %compiler: $c.class .*-DLIBCRYPTO_BUILD -DZLIB .*% + OPENSSLDIR: N/A + ENGINESDIR: N/A %Seeding source: .+% EOO |