Merge branch 'main' into mamckee-debugging-updates

Author: mamckee

Diff for: CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13.0)
 
 project(SymCrypt-OpenSSL
-    VERSION 1.5.1
+    VERSION 1.6.1
     DESCRIPTION "The SymCrypt engine for OpenSSL (SCOSSL)"
     HOMEPAGE_URL "https://github.com/microsoft/SymCrypt-OpenSSL")
 
@@ -12,7 +12,7 @@ if (SYMCRYPT_ROOT_DIR)
 else()
     find_package(PkgConfig)
     if (PKG_CONFIG_FOUND)
-        pkg_check_modules(SYMCRYPT REQUIRED symcrypt)
+        pkg_check_modules(SYMCRYPT REQUIRED symcrypt>=103.6.0)
         message(STATUS "SymCrypt Includes: ${SYMCRYPT_INCLUDE_DIRS}")
         include_directories(${SYMCRYPT_INCLUDE_DIRS})
     else()
@@ -46,4 +46,4 @@ add_subdirectory (SslPlay)
 
 if (${OPENSSL_VERSION} VERSION_GREATER_EQUAL 3)
     add_subdirectory (SymCryptProvider)
-endif()
+endif()

Diff for: EvpTestRecipes/3.0/evpkdf_kbkdf_counter.txt

@@ -12,6 +12,17 @@ Ctrl.hexkey = hexkey:0001020304050607
 Ctrl.hexinfo = hexinfo:101112131415161718191a1b1c1d1e1f
 Output = cf4bfe4f85a10bad
 
+KDF = KBKDF
+Ctrl.mode = mode:COUNTER
+Ctrl.digest = digest:SHA224
+Ctrl.mac = mac:HMAC
+Ctrl.use-l = use-l:1
+Ctrl.use-separator = use-separator:1
+Ctrl.salt = salt:Label
+Ctrl.hexkey = hexkey:0001020304050607
+Ctrl.hexinfo = hexinfo:101112131415161718191a1b1c1d1e1f
+Output = 6ba2131f742df49b
+
 KDF = KBKDF
 Ctrl.mode = mode:COUNTER
 Ctrl.digest = digest:SHA256
@@ -44,3 +55,71 @@ Ctrl.salt = salt:Label
 Ctrl.hexkey = hexkey:0001020304050607
 Ctrl.hexinfo = hexinfo:101112131415161718191a1b1c1d1e1f
 Output = db3a18d96c4ad41e
+
+KDF = KBKDF
+Ctrl.mode = mode:COUNTER
+Ctrl.digest = digest:SHA512-224
+Ctrl.mac = mac:HMAC
+Ctrl.use-l = use-l:1
+Ctrl.use-separator = use-separator:1
+Ctrl.salt = salt:Label
+Ctrl.hexkey = hexkey:0001020304050607
+Ctrl.hexinfo = hexinfo:101112131415161718191a1b1c1d1e1f
+Output = 433fb6029801ccf5
+
+KDF = KBKDF
+Ctrl.mode = mode:COUNTER
+Ctrl.digest = digest:SHA512-256
+Ctrl.mac = mac:HMAC
+Ctrl.use-l = use-l:1
+Ctrl.use-separator = use-separator:1
+Ctrl.salt = salt:Label
+Ctrl.hexkey = hexkey:0001020304050607
+Ctrl.hexinfo = hexinfo:101112131415161718191a1b1c1d1e1f
+Output = 31117cf3b4622835
+
+KDF = KBKDF
+Ctrl.mode = mode:COUNTER
+Ctrl.digest = digest:SHA3-224
+Ctrl.mac = mac:HMAC
+Ctrl.use-l = use-l:1
+Ctrl.use-separator = use-separator:1
+Ctrl.salt = salt:Label
+Ctrl.hexkey = hexkey:0001020304050607
+Ctrl.hexinfo = hexinfo:101112131415161718191a1b1c1d1e1f
+Output = 843c04b2542d8ca4
+
+
+KDF = KBKDF
+Ctrl.mode = mode:COUNTER
+Ctrl.digest = digest:SHA3-256
+Ctrl.mac = mac:HMAC
+Ctrl.use-l = use-l:1
+Ctrl.use-separator = use-separator:1
+Ctrl.salt = salt:Label
+Ctrl.hexkey = hexkey:0001020304050607
+Ctrl.hexinfo = hexinfo:101112131415161718191a1b1c1d1e1f
+Output = d4c72c668a1de0b9
+
+
+KDF = KBKDF
+Ctrl.mode = mode:COUNTER
+Ctrl.digest = digest:SHA3-384
+Ctrl.mac = mac:HMAC
+Ctrl.use-l = use-l:1
+Ctrl.use-separator = use-separator:1
+Ctrl.salt = salt:Label
+Ctrl.hexkey = hexkey:0001020304050607
+Ctrl.hexinfo = hexinfo:101112131415161718191a1b1c1d1e1f
+Output = f6392bd50ae4361b
+
+KDF = KBKDF
+Ctrl.mode = mode:COUNTER
+Ctrl.digest = digest:SHA3-512
+Ctrl.mac = mac:HMAC
+Ctrl.use-l = use-l:1
+Ctrl.use-separator = use-separator:1
+Ctrl.salt = salt:Label
+Ctrl.hexkey = hexkey:0001020304050607
+Ctrl.hexinfo = hexinfo:101112131415161718191a1b1c1d1e1f
+Output = 5a0d0630a248121f