Patch Libacvp to Support Additional OpenSSL Tests (#780) (#1638)

Update libacvp to version 1.3.0 and add support for additional OpenSSL tests.

Co-authored-by: Nicolas Ontiveros <54044510+niontive@users.noreply.github.com>

SPECS/libacvp/libacvp.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "libacvp-1.2.0.tar.gz": "92b5a0e30db2af62a8084b1523566b2ebba08282a48bfdb99871f45084677dc8"
+  "libacvp-1.3.0.tar.gz": "afc6b05f8b62846cae69e5722088b106a6a47a9a43cf700a7b905979381d357e"
  }
 }

SPECS/libacvp/libacvp.spec

@@ -1,6 +1,6 @@
 Summary:        A library that implements the client-side of the ACVP protocol
 Name:           libacvp
-Version:        1.2.0
+Version:        1.3.0
 Release:        1%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
@@ -9,6 +9,7 @@ Group:          Development/Libraries
 URL:            https://github.com/cisco/libacvp
 # Source0:      https://github.com/cisco/%%{name}/archive/v%%{version}.tar.gz
 Source0:        %{name}-%{version}.tar.gz
+Patch0:         openssl.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc
@@ -28,13 +29,13 @@ This app provides the glue between the OpenSSL module under test
 and the library itself.
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
 ./configure \
     --prefix=%{_prefix} \
     --enable-offline \
-    CFLAGS="-pthread" \
+    CFLAGS="-pthread -DACVP_NO_RUNTIME -DOPENSSL_KWP -DOPENSSL_KDF_SUPPORT -O0 -g" \
     LIBS="-ldl"
 make clean
 make CC=gcc
@@ -43,10 +44,6 @@ make CC=gcc
 make install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name "*.la" -delete -print
 
-%clean
-rm -rf %{buildroot}/*
-
-
 %files
 %license LICENSE
 %{_datadir}/README.md
@@ -57,5 +54,9 @@ rm -rf %{buildroot}/*
 %{_bindir}/acvp_app
 
 %changelog
+* Fri Jul 30 2021 Nicolas Ontiveros <niontive@microsoft.com> - 1.3.0-1
+- Update to version 1.3.0
+- Add patch to support OpenSSL ACVP testing.
+
 * Mon Feb 08 2021 Nicolas Ontiveros <niontive@microsoft.com> - 1.2.0-1
-- Original version for CBL-Mariner. License verified.
+- Original version for CBL-Mariner. License verified.

cgmanifest.json

@@ -2889,8 +2889,8 @@
         "type": "other",
         "other": {
           "name": "libacvp",
-          "version": "1.2.0",
-          "downloadUrl": "https://github.com/cisco/libacvp/archive/v1.2.0.tar.gz"
+          "version": "1.3.0",
+          "downloadUrl": "https://github.com/cisco/libacvp/archive/v1.3.0.tar.gz"
         }
       }
     },