From bcc4ae675edd66242aa27f3ed3b7d1bf6f1005e3 Mon Sep 17 00:00:00 2001
From: Pauli <paul.dale@oracle.com>
Date: Fri, 8 May 2020 10:24:12 +1000
Subject: [PATCH] provider: add RAND algorithm tables

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/11682)
---
 providers/defltprov.c     | 13 +++++++++++++
 providers/fips/fipsprov.c | 17 +++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/providers/defltprov.c b/providers/defltprov.c
index 8e27b33fc2..c68e34770e 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -337,6 +337,17 @@ static const OSSL_ALGORITHM deflt_keyexch[] = {
     { NULL, NULL, NULL }
 };
 
+static const OSSL_ALGORITHM deflt_rands[] = {
+    { "TEST-RAND", "provider=default", test_rng_functions },
+    { "HASH-DRBG", "provider=default", drbg_hash_functions },
+/*
+    { "HMAC-DRBG", "provider=default", drbg_hmac_functions },
+    { "CTR-DRBG", "provider=default", drbg_ctr_functions },
+*/
+    { "CRNGT:continuous-rng-test", "provider=default", crngt_functions },
+    { NULL, NULL, NULL }
+};
+
 static const OSSL_ALGORITHM deflt_signature[] = {
 #ifndef OPENSSL_NO_DSA
     { "DSA:dsaEncryption", "provider=default", dsa_signature_functions },
@@ -536,6 +547,8 @@ static const OSSL_ALGORITHM *deflt_query(void *provctx, int operation_id,
         return deflt_macs;
     case OSSL_OP_KDF:
         return deflt_kdfs;
+    case OSSL_OP_RAND:
+        return deflt_rands;
     case OSSL_OP_KEYMGMT:
         return deflt_keymgmt;
     case OSSL_OP_KEYEXCH:
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index 4d39570464..5927c9fedc 100644
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -469,6 +469,21 @@ static const OSSL_ALGORITHM fips_kdfs[] = {
     { NULL, NULL, NULL }
 };
 
+static const OSSL_ALGORITHM fips_rands[] = {
+    /*
+     * The TEST RNG must be first, so it can be suppressed after the power up
+     * tests are completed.
+     */
+    { "TEST-RAND", "provider=fips", test_rng_functions },
+    { "HASH-DRBG", "provider=fips", drbg_hash_functions },
+/*
+    { "HMAC-DRBG", "provider=fips", drbg_hmac_functions },
+    { "CTR-DRBG", "provider=fips", drbg_ctr_functions },
+*/
+    { "CRNGT:continuous-rng-test", "provider=fips", crngt_functions },
+    { NULL, NULL, NULL }
+};
+
 static const OSSL_ALGORITHM fips_keyexch[] = {
 #ifndef OPENSSL_NO_DH
     { "DH:dhKeyAgreement", "provider=fips,fips=yes", dh_keyexch_functions },
@@ -533,6 +548,8 @@ static const OSSL_ALGORITHM *fips_query(void *provctx, int operation_id,
         return fips_macs;
     case OSSL_OP_KDF:
         return fips_kdfs;
+    case OSSL_OP_RAND:
+        return fips_rands;
     case OSSL_OP_KEYMGMT:
         return fips_keymgmt;
     case OSSL_OP_KEYEXCH:
-- 
2.25.1