Commit 98174373b92ea949e3b5ff44dff88ba4d060df2c
Committed by
Jay Berkenbilt
Jay Berkenbilt
1 parent
0f250723
Update azure-pipelines for openssl crypto provider
Explicitly enable openssl crypto provider in the linux and sanitizer builds, and disable it in the windows build.
Showing
4 changed files
with
5 additions
and
5 deletions
azure-pipelines/build-linux
| @@ -3,9 +3,9 @@ set -ex | @@ -3,9 +3,9 @@ set -ex | ||
| 3 | sudo apt-get update | 3 | sudo apt-get update |
| 4 | sudo apt-get -y install \ | 4 | sudo apt-get -y install \ |
| 5 | autoconf build-essential zlib1g-dev libjpeg-dev libgnutls28-dev \ | 5 | autoconf build-essential zlib1g-dev libjpeg-dev libgnutls28-dev \ |
| 6 | - docbook-xsl fop xsltproc libxml2-utils inkscape imagemagick | 6 | + libssl-dev docbook-xsl fop xsltproc libxml2-utils inkscape imagemagick |
| 7 | ./configure --enable-werror --enable-doc-maintenance \ | 7 | ./configure --enable-werror --enable-doc-maintenance \ |
| 8 | - --enable-crypto-native --enable-crypto-gnutls \ | 8 | + --enable-crypto-native --enable-crypto-openssl --enable-crypto-gnutls \ |
| 9 | --enable-show-failed-test-output | 9 | --enable-show-failed-test-output |
| 10 | make -j$(nproc) -k | 10 | make -j$(nproc) -k |
| 11 | for i in $(./qpdf/build/qpdf --show-crypto); do | 11 | for i in $(./qpdf/build/qpdf --show-crypto); do |
azure-pipelines/build-linux32
| @@ -16,7 +16,7 @@ sudo apt-get update | @@ -16,7 +16,7 @@ sudo apt-get update | ||
| 16 | 16 | ||
| 17 | sudo apt-get -y install \ | 17 | sudo apt-get -y install \ |
| 18 | autoconf build-essential zlib1g-dev:i386 libjpeg-dev:i386 \ | 18 | autoconf build-essential zlib1g-dev:i386 libjpeg-dev:i386 \ |
| 19 | - g++-multilib | 19 | + libssl-dev:i386 g++-multilib |
| 20 | ./configure --enable-werror --enable-show-failed-test-output \ | 20 | ./configure --enable-werror --enable-show-failed-test-output \ |
| 21 | CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 | 21 | CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 |
| 22 | 22 |
azure-pipelines/build-windows
| @@ -27,7 +27,7 @@ PATH=$cwd/libqpdf/build:$PATH | @@ -27,7 +27,7 @@ PATH=$cwd/libqpdf/build:$PATH | ||
| 27 | 27 | ||
| 28 | installdir=install-$tool$wordsize | 28 | installdir=install-$tool$wordsize |
| 29 | rm -rf $installdir | 29 | rm -rf $installdir |
| 30 | -./config-$tool --enable-show-failed-test-output --disable-crypto-gnutls | 30 | +./config-$tool --enable-show-failed-test-output --disable-crypto-gnutls --disable-crypto-openssl |
| 31 | make -j$(nproc) -k | 31 | make -j$(nproc) -k |
| 32 | make -k check | 32 | make -k check |
| 33 | make install | 33 | make install |
azure-pipelines/test-sanitizers
| @@ -7,7 +7,7 @@ sudo apt-get -y install \ | @@ -7,7 +7,7 @@ sudo apt-get -y install \ | ||
| 7 | CFLAGS="-fsanitize=address -fsanitize=undefined -g" \ | 7 | CFLAGS="-fsanitize=address -fsanitize=undefined -g" \ |
| 8 | CXXFLAGS="-fsanitize=address -fsanitize=undefined -g" \ | 8 | CXXFLAGS="-fsanitize=address -fsanitize=undefined -g" \ |
| 9 | LDFLAGS="-fsanitize=address -fsanitize=undefined" \ | 9 | LDFLAGS="-fsanitize=address -fsanitize=undefined" \ |
| 10 | - --enable-crypto-native --enable-crypto-gnutls \ | 10 | + --enable-crypto-native --enable-crypto-openssl --enable-crypto-gnutls \ |
| 11 | --enable-werror --disable-shared --enable-show-failed-test-output | 11 | --enable-werror --disable-shared --enable-show-failed-test-output |
| 12 | make -j$(nproc) -k | 12 | make -j$(nproc) -k |
| 13 | for i in $(./qpdf/build/qpdf --show-crypto); do | 13 | for i in $(./qpdf/build/qpdf --show-crypto); do |