Update SymCrypt and SCOSSL SPECs (#5547)

* Update SymCrypt and SCOSSL SPEC files

+ Preparing for certification, rev SymCrypt to 103.0.1 and SCOSSL to
  1.3.0
+ Add basic %check sections to the SPECs

* Move %check sections after %install sections

* Use clang for SymCrypt Arm64 build

* Follow linting advice to refer to gcc directly for x86_64

SPECS/SymCrypt-OpenSSL/SymCrypt-OpenSSL.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "SymCrypt-OpenSSL-1.2.0.tar.gz": "aaf010a463660b2bc8f3838667155e0a82878ce0629e38870b5f81c733bdfeef"
+  "SymCrypt-OpenSSL-1.3.0.tar.gz": "079e7b5e58ab6b9bb1372f2370327eea6e74de78fc071bce2d6de0f21c116f85"
  }
 }

SPECS/SymCrypt-OpenSSL/SymCrypt-OpenSSL.spec

@@ -1,6 +1,6 @@
 Summary:        The SymCrypt engine for OpenSSL (SCOSSL) allows the use of OpenSSL with SymCrypt as the provider for core cryptographic operations
 Name:           SymCrypt-OpenSSL
-Version:        1.2.0
+Version:        1.3.0
 Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
@@ -45,12 +45,18 @@ cmake --build .
 cd bin
 cmake --build . --target install
 
+%check
+./bin/SslPlay/SslPlay
+
 %files
 %license LICENSE
 %{_libdir}/engines-1.1/symcryptengine.so
 %{_includedir}/scossl.h
 
 %changelog
+* Mon May 22 2023 Samuel Lee <saml@microsoft.com> - 1.3.0-1
+- Update SymCrypt-OpenSSL to v1.3.0. Adds support for HMAC and fixes corner RSA-PSS bug. Run smoke test in check
+
 * Mon Jun 06 2022 Samuel Lee <saml@microsoft.com> - 1.2.0-1
 - Update SymCrypt-OpenSSL to v1.2.0 to improve performance and fix some corner case bugs
 

SPECS/SymCrypt/SymCrypt.signatures.json

@@ -1,6 +1,6 @@
 {
  "Signatures": {
-  "SymCrypt-102.0.0.tar.gz": "0f79c35e055cea61077f927a1bbc08bbc86a4a34e62340f9d67b487f2ec8d152",
+  "SymCrypt-103.0.1.tar.gz": "71acf61ccee7108dd438a46c92f256980279781eb6595d774714f7e4ff9c4c2e",
   "jitterentropy-library-3.3.1.tar.gz": "4a50cb02b4836cd5550016e2fc2263e6982abaa11467a9e1cea260c1c2f7d487"
  }
 }

SPECS/SymCrypt/SymCrypt.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Summary:        A core cryptographic library written by Microsoft
 Name:           SymCrypt
-Version:        102.0.0
+Version:        103.0.1
 Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
@@ -25,10 +25,15 @@ A core cryptographic library written by Microsoft
 # Only x86_64 and aarch64 are currently supported
 %ifarch x86_64
 %define symcrypt_arch AMD64
+%define symcrypt_cc gcc
+%define symcrypt_cxx g++
 %endif
 
 %ifarch aarch64
 %define symcrypt_arch ARM64
+# Currently SymCrypt ARM64 build requires use of clang
+%define symcrypt_cc clang
+%define symcrypt_cxx clang++
 %endif
 
 %prep
@@ -39,22 +44,25 @@ rm -rf jitterentropy-library
 ln -s jitterentropy-library-3.3.1 jitterentropy-library
 
 %build
-mkdir bin; cd bin
+cmake   -S . -B bin \
+        -DSYMCRYPT_TARGET_ARCH=%{symcrypt_arch} \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_C_COMPILER=%{symcrypt_cc} \
+        -DCMAKE_CXX_COMPILER=%{symcrypt_cxx}
 
-cmake   .. \
-        -DCMAKE_TOOLCHAIN_FILE="../cmake-toolchain/LinuxUserMode-%{symcrypt_arch}.cmake" \
-        -DCMAKE_BUILD_TYPE=Release
-
-cmake --build .
+cmake --build bin
 
 %install
 mkdir -p %{buildroot}%{_libdir}
 mkdir -p %{buildroot}%{_includedir}
 install inc/symcrypt* %{buildroot}%{_includedir}
 # Use cp -P to preserve symbolic links
-cp -P bin/module/%{symcrypt_arch}/LinuxUserMode/generic/libsymcrypt.so* %{buildroot}%{_libdir}
+cp -P bin/module/generic/libsymcrypt.so* %{buildroot}%{_libdir}
 chmod 755 %{buildroot}%{_libdir}/libsymcrypt.so.%{version}
 
+%check
+./bin/exe/symcryptunittest
+
 %files
 %license LICENSE
 %license NOTICE
@@ -62,6 +70,9 @@ chmod 755 %{buildroot}%{_libdir}/libsymcrypt.so.%{version}
 %{_includedir}/*
 
 %changelog
+* Mon May 22 2023 Samuel Lee <saml@microsoft.com> - 103.0.1-1
+- Update SymCrypt to v103.0.1 for FIPS certification. Run unit tests in check
+
 * Fri Oct 07 2022 Andy Caldwell <andycaldwell@microsoft.com> - 102.0.0-2
 - Update `clang` on aarch64 builds to enable `-pie`
 

cgmanifest.json

@@ -27927,8 +27927,8 @@
         "type": "other",
         "other": {
           "name": "SymCrypt",
-          "version": "102.0.0",
-          "downloadUrl": "https://github.com/microsoft/SymCrypt/archive/v102.0.0.tar.gz"
+          "version": "103.0.1",
+          "downloadUrl": "https://github.com/microsoft/SymCrypt/archive/v103.0.1.tar.gz"
         }
       }
     },
@@ -27937,8 +27937,8 @@
         "type": "other",
         "other": {
           "name": "SymCrypt-OpenSSL",
-          "version": "1.2.0",
-          "downloadUrl": "https://github.com/microsoft/SymCrypt-OpenSSL/archive/v1.2.0.tar.gz"
+          "version": "1.3.0",
+          "downloadUrl": "https://github.com/microsoft/SymCrypt-OpenSSL/archive/v1.3.0.tar.gz"
         }
       }
     },