From 4787625759d576bedf12e8fde169f9117946b50c Mon Sep 17 00:00:00 2001 From: Christian Paquin Date: Thu, 3 Sep 2020 10:44:15 -0400 Subject: [PATCH 01/12] Added comment --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 242d6a9ffe6fd..7c13f3bf8b984 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,4 @@ +# add OQS build image: - Visual Studio 2017 From e212d92eff2b1d812c091e7e4408b9a45fd52f3f Mon Sep 17 00:00:00 2001 From: Christian Paquin Date: Thu, 3 Sep 2020 14:28:00 -0400 Subject: [PATCH 02/12] Added oqs build script --- appveyor.yml | 8 ++++++-- appveyor_build.bat | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 appveyor_build.bat diff --git a/appveyor.yml b/appveyor.yml index 7c13f3bf8b984..6d594be7d18f8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ # add OQS build image: - - Visual Studio 2017 + - Visual Studio 2019 platform: - x64 @@ -13,8 +13,11 @@ environment: configuration: - shared + BUILD_SHARED: ON - plain + BUILD_SHARED: OFF - minimal + BUILD_SHARED: OFF before_build: - ps: >- @@ -39,7 +42,7 @@ before_build: } Else { $env:SHARED="no-shared no-makedepend" } - - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM% + - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM% - mkdir _build - cd _build - perl ..\Configure %TARGET% %SHARED% @@ -52,6 +55,7 @@ before_build: } build_script: + - cmd: '%APPVEYOR_BUILD_FOLDER%\appveyor_build.bat' - cd _build - ps: >- If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { diff --git a/appveyor_build.bat b/appveyor_build.bat new file mode 100644 index 0000000000000..3b4abdcb3a61b --- /dev/null +++ b/appveyor_build.bat @@ -0,0 +1,8 @@ +@echo on +CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" +mkdir build +cd build +REM SPHINCS and Rainbow cause a big slowdown in the tests +cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DOQS_ENABLE_SIG_SPHINCS=OFF -DOQS_ENABLE_SIG_RAINBOW=OFF -DBUILD_SHARED_LIBS=%BUILD_SHARED% +ninja + From 4d7400d03802cabe088845f56b863d34870b77e2 Mon Sep 17 00:00:00 2001 From: Christian Paquin Date: Fri, 18 Sep 2020 14:32:14 -0400 Subject: [PATCH 03/12] Updated yml to build oqs. --- appveyor.yml | 13 ++++++++++--- appveyor_build.bat | 8 -------- 2 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 appveyor_build.bat diff --git a/appveyor.yml b/appveyor.yml index 6d594be7d18f8..dbc126da5f594 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,11 +13,8 @@ environment: configuration: - shared - BUILD_SHARED: ON - plain - BUILD_SHARED: OFF - minimal - BUILD_SHARED: OFF before_build: - ps: >- @@ -37,12 +34,22 @@ before_build: - ps: >- If ($env:Configuration -Match "shared") { $env:SHARED="no-makedepend" + $env:OQSSHARED="ON" } ElseIf ($env:Configuration -Match "minimal") { $env:SHARED="no-shared no-dso no-makedepend no-aria no-async no-autoload-config no-blake2 no-bf no-camellia no-cast no-chacha no-cmac no-cms no-comp no-ct no-des no-dgram no-dh no-dsa no-dtls no-ec2m no-engine no-filenames no-gost no-idea no-mdc2 no-md4 no-multiblock no-nextprotoneg no-ocsp no-ocb no-poly1305 no-psk no-rc2 no-rc4 no-rmd160 no-seed no-siphash no-sm2 no-sm3 no-sm4 no-srp no-srtp no-ssl3 no-ssl3-method no-ts no-ui-console no-whirlpool no-asm -DOPENSSL_SMALL_FOOTPRINT" + $env:OQSSHARED="OFF" } Else { $env:SHARED="no-shared no-makedepend" + $env:OQSSHARED="OFF" } - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM% + # build oqs + - mkdir oqsbuild + - cd oqsbuild + - git clone --branch master https://github.com/open-quantum-safe/liboqs.git + - cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DOQS_ENABLE_SIG_SPHINCS=OFF -DOQS_ENABLE_SIG_RAINBOW=OFF -DBUILD_SHARED_LIBS=%OQSSHARED% + - ninja + - ninja install - mkdir _build - cd _build - perl ..\Configure %TARGET% %SHARED% diff --git a/appveyor_build.bat b/appveyor_build.bat deleted file mode 100644 index 3b4abdcb3a61b..0000000000000 --- a/appveyor_build.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo on -CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" -mkdir build -cd build -REM SPHINCS and Rainbow cause a big slowdown in the tests -cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DOQS_ENABLE_SIG_SPHINCS=OFF -DOQS_ENABLE_SIG_RAINBOW=OFF -DBUILD_SHARED_LIBS=%BUILD_SHARED% -ninja - From a1d8b33a027971564fb06fdb084d184f2ed1b7ac Mon Sep 17 00:00:00 2001 From: Christian Paquin Date: Fri, 18 Sep 2020 14:48:21 -0400 Subject: [PATCH 04/12] Fixed oqs build. --- appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index dbc126da5f594..82a459b1fbee3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -44,12 +44,14 @@ before_build: } - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM% # build oqs + - git clone --branch master https://github.com/open-quantum-safe/liboqs.git + - cd liboqs - mkdir oqsbuild - cd oqsbuild - - git clone --branch master https://github.com/open-quantum-safe/liboqs.git - - cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DOQS_ENABLE_SIG_SPHINCS=OFF -DOQS_ENABLE_SIG_RAINBOW=OFF -DBUILD_SHARED_LIBS=%OQSSHARED% + - cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\oqs -DCMAKE_BUILD_TYPE=Release -DOQS_ENABLE_SIG_SPHINCS=OFF -DOQS_ENABLE_SIG_RAINBOW=OFF -DBUILD_SHARED_LIBS=%OQSSHARED% - ninja - ninja install + - cd ..\.. - mkdir _build - cd _build - perl ..\Configure %TARGET% %SHARED% From 3a5fe2aa9b7b9261c1de2f3aace0b4a806f2c4ac Mon Sep 17 00:00:00 2001 From: Christian Paquin Date: Fri, 18 Sep 2020 15:28:46 -0400 Subject: [PATCH 05/12] Trying to fix appveyor build --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 82a459b1fbee3..806f9ed453817 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,3 @@ -# add OQS build image: - Visual Studio 2019 @@ -51,7 +50,7 @@ before_build: - cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\oqs -DCMAKE_BUILD_TYPE=Release -DOQS_ENABLE_SIG_SPHINCS=OFF -DOQS_ENABLE_SIG_RAINBOW=OFF -DBUILD_SHARED_LIBS=%OQSSHARED% - ninja - ninja install - - cd ..\.. + - cd %APPVEYOR_BUILD_FOLDER% - mkdir _build - cd _build - perl ..\Configure %TARGET% %SHARED% From a0fa913377c0b83fb14b7cef7924fd4f67a3a424 Mon Sep 17 00:00:00 2001 From: Christian Paquin Date: Wed, 30 Sep 2020 13:46:49 -0400 Subject: [PATCH 06/12] Removed old build script call --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 806f9ed453817..b63288a546a1b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -63,7 +63,6 @@ before_build: } build_script: - - cmd: '%APPVEYOR_BUILD_FOLDER%\appveyor_build.bat' - cd _build - ps: >- If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { From 34ea952e578abf99ac087148c55d2833f00d0c5e Mon Sep 17 00:00:00 2001 From: Christian Paquin Date: Wed, 30 Sep 2020 15:45:01 -0400 Subject: [PATCH 07/12] Removed oqs comment from version macros. --- include/openssl/opensslv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index 2730194ccb80e..17d271f54c7f5 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -40,7 +40,7 @@ extern "C" { * major minor fix final patch/beta) */ # define OPENSSL_VERSION_NUMBER 0x1010107fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1g 21 Apr 2020, Open Quantum Safe 2020-08 snapshot" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1g 21 Apr 2020" /*- * The macros below are to be used for shared library (.so, .dll, ...) From d6634c9ef91754b02575179cb488fb070d68fce0 Mon Sep 17 00:00:00 2001 From: Christian Paquin Date: Fri, 9 Oct 2020 16:44:35 -0400 Subject: [PATCH 08/12] Reverted deletion of OQS note in version text description. --- include/openssl/opensslv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index 17d271f54c7f5..2730194ccb80e 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -40,7 +40,7 @@ extern "C" { * major minor fix final patch/beta) */ # define OPENSSL_VERSION_NUMBER 0x1010107fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1g 21 Apr 2020" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1g 21 Apr 2020, Open Quantum Safe 2020-08 snapshot" /*- * The macros below are to be used for shared library (.so, .dll, ...) From 7a1cb04d4e23efc2784f2dbbb9db294518c6732f Mon Sep 17 00:00:00 2001 From: Christian Paquin Date: Thu, 15 Oct 2020 10:44:24 -0400 Subject: [PATCH 09/12] updated comment in appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b63288a546a1b..9f27538e82309 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,7 +42,7 @@ before_build: $env:OQSSHARED="OFF" } - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM% - # build oqs + # build liboqs - git clone --branch master https://github.com/open-quantum-safe/liboqs.git - cd liboqs - mkdir oqsbuild From e65947f792ae197f294941de055a146f8f2298c5 Mon Sep 17 00:00:00 2001 From: Christian Paquin Date: Thu, 15 Oct 2020 11:28:00 -0400 Subject: [PATCH 10/12] Added comment --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 9f27538e82309..0500b3ad6a0c3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,4 @@ +# original appveyor config with oqs tests image: - Visual Studio 2019 From 12e4aa9337d1d96aee25faae291f43d58736d9b6 Mon Sep 17 00:00:00 2001 From: Christian Paquin Date: Thu, 15 Oct 2020 14:05:17 -0400 Subject: [PATCH 11/12] Enable VM debugging --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 0500b3ad6a0c3..93ec17cffd727 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,6 +11,9 @@ environment: matrix: - VSVER: 15 +init: + - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + configuration: - shared - plain From 9ab88ba673d8ad335ee1ed53fcc3b9ffced43387 Mon Sep 17 00:00:00 2001 From: Christian Paquin Date: Thu, 15 Oct 2020 15:30:42 -0400 Subject: [PATCH 12/12] comment --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 93ec17cffd727..3429c95a17413 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -# original appveyor config with oqs tests +# original appveyor config with oqs tests. image: - Visual Studio 2019