openssl-1_1/openssl-fips-DH_selftest_shared_secret_KAT.patch

Index: openssl-1.1.1d/crypto/fips/fips_dh_selftest.c
===================================================================
--- openssl-1.1.1d.orig/crypto/fips/fips_dh_selftest.c	2020-09-08 20:40:41.313074570 +0200
+++ openssl-1.1.1d/crypto/fips/fips_dh_selftest.c	2020-09-08 20:41:05.337219024 +0200
@@ -119,6 +119,41 @@ static const unsigned char dh_test_2048_
     0xEC, 0x55, 0xF6, 0xCC
 };
 
+static const unsigned char dh_test_2048_shared_secret[] = {
+    0x62, 0x68, 0x15, 0xbd, 0xc4, 0x9a, 0x3c, 0xfc,
+    0xda, 0x5d, 0xc5, 0x81, 0xc9, 0xe7, 0x1b, 0xbb,
+    0x94, 0x19, 0xb0, 0x5d, 0x95, 0xc3, 0x98, 0xd0,
+    0xc6, 0x8b, 0x05, 0x34, 0xa5, 0xe2, 0xe4, 0xa8,
+    0x7c, 0x4b, 0x7c, 0x41, 0xf9, 0x6d, 0xc1, 0xcc,
+    0x6e, 0xb6, 0x34, 0xe1, 0x71, 0xc3, 0x00, 0x03,
+    0x06, 0x08, 0x1d, 0x90, 0x88, 0x3c, 0x5d, 0x14,
+    0x2d, 0x56, 0xac, 0x78, 0x83, 0xd6, 0xe9, 0x7c,
+    0x6c, 0x34, 0xdf, 0xe0, 0x98, 0x14, 0xaa, 0xbe,
+    0x3b, 0x83, 0xc5, 0xd1, 0xac, 0xec, 0xa6, 0x0b,
+    0xc1, 0x94, 0x8d, 0x42, 0x3f, 0xb8, 0x63, 0xef,
+    0xb1, 0x1b, 0x60, 0x4f, 0xfa, 0xfa, 0xbb, 0x57,
+    0x28, 0x27, 0x4d, 0x78, 0xa4, 0x3d, 0x7a, 0xd8,
+    0xab, 0x2e, 0x7d, 0x8b, 0xd3, 0xa9, 0x78, 0x74,
+    0xfe, 0x3a, 0x08, 0x5f, 0xe3, 0xf5, 0x5a, 0xfa,
+    0xa6, 0x93, 0x67, 0xea, 0xae, 0x5e, 0xd6, 0xc5,
+    0xa1, 0xab, 0x0a, 0x1e, 0x78, 0xe7, 0xdd, 0xbc,
+    0xae, 0xb7, 0x3e, 0x7d, 0x8b, 0xd8, 0x66, 0x92,
+    0x38, 0x1b, 0x96, 0xeb, 0xcb, 0xcb, 0x6a, 0xcc,
+    0xd8, 0x42, 0x80, 0x66, 0xa9, 0xa2, 0x75, 0xeb,
+    0xe4, 0x79, 0x11, 0x7a, 0xca, 0x84, 0x77, 0x7a,
+    0xe6, 0xe2, 0x13, 0xb1, 0x90, 0xd3, 0x0f, 0x87,
+    0x2a, 0x0f, 0xf5, 0x17, 0x61, 0x15, 0x05, 0x31,
+    0x5f, 0xdf, 0xb4, 0x8e, 0xf3, 0x21, 0x27, 0x6a,
+    0x69, 0xdc, 0x52, 0x79, 0x64, 0x51, 0x1f, 0xc0,
+    0xed, 0x55, 0x57, 0xd9, 0x5c, 0x6f, 0xdb, 0xaa,
+    0x08, 0x44, 0xb9, 0x71, 0x71, 0x15, 0x27, 0xe8,
+    0xe9, 0x42, 0x78, 0xc1, 0xc4, 0xc0, 0xbd, 0x28,
+    0x23, 0xa1, 0x30, 0x57, 0xf0, 0x2e, 0x24, 0xf0,
+    0x34, 0x17, 0x97, 0x1c, 0x4c, 0x2a, 0x98, 0x76,
+    0x3d, 0x50, 0x7f, 0x32, 0xa2, 0x25, 0x94, 0x9e,
+    0x1e, 0xbc, 0x97, 0x96, 0xd6, 0x14, 0x61, 0x5b
+};
+
 int FIPS_selftest_dh()
 {
     DH *dh = NULL;
@@ -127,6 +162,7 @@ int FIPS_selftest_dh()
     int len;
     BIGNUM *p = NULL, *g = NULL, *priv_key = NULL, *tmp_pub_key = NULL;
     const BIGNUM *pub_key;
+    unsigned char *shared_secret = NULL;
 
     fips_load_key_component(p, dh_test_2048);
     fips_load_key_component(g, dh_test_2048);
@@ -162,6 +198,19 @@ int FIPS_selftest_dh()
         memcmp(pub_key_bin, dh_test_2048_pub_key, len) != 0)
         goto err;
 
+    /* Shared secret KAT test */
+    len = DH_size(dh);
+    if ((shared_secret = OPENSSL_malloc(len)) == NULL)
+        goto err;
+
+    if ((len = DH_compute_key(shared_secret, pub_key, dh)) == -1)
+        goto err;
+
+    if (len != sizeof(dh_test_2048_shared_secret) ||
+       (memcmp(shared_secret, dh_test_2048_shared_secret, len) != 0)) {
+        goto err;
+    }
+
     ret = 1;
 
  err:
@@ -175,6 +224,7 @@ int FIPS_selftest_dh()
     }
 
     OPENSSL_free(pub_key_bin);
+    OPENSSL_free(shared_secret);
     return ret;
 }
 #endif