updated randombytes NIST API

Author: vsoftco

examples/rand.cpp

@@ -20,7 +20,7 @@ int main() {
     entropy_seed[0] = 100;
     entropy_seed[20] = 200;
     entropy_seed[47] = 150;
-    oqs::rand::randombytes_nist_kat_init(entropy_seed);
+    oqs::rand::randombytes_nist_kat_init_256bit(entropy_seed);
     std::cout << std::setw(18) << std::left;
     std::cout << "NIST-KAT: " << oqs::rand::randombytes(32) << '\n';
 

include/rand/rand.h

@@ -36,7 +36,7 @@ namespace rand {
  * \param bytes_to_read The number of random bytes to generate
  * \return Vector of random bytes
  */
-bytes randombytes(std::size_t bytes_to_read) {
+inline bytes randombytes(std::size_t bytes_to_read) {
     bytes result(bytes_to_read);
     C::OQS_randombytes(result.data(), bytes_to_read);
     return result;
@@ -51,7 +51,7 @@ bytes randombytes(std::size_t bytes_to_read) {
  * \param [in] bytes_to_read The number of random bytes to generate
  * \param [out] random_array Output vector of random bytes
  */
-void randombytes(bytes& random_array, std::size_t bytes_to_read) {
+inline void randombytes(bytes& random_array, std::size_t bytes_to_read) {
     if (bytes_to_read > random_array.size())
         throw(std::out_of_range(
             "bytes_to_read exceeds the size of random_array"));
@@ -65,19 +65,21 @@ void randombytes(bytes& random_array, std::size_t bytes_to_read) {
  * "OpenSSL", or the corresponding macros OQS_RAND_alg_system,
  * OQS_RAND_alg_nist_kat, and OQS_RAND_alg_openssl, respectively.
  */
-void randombytes_switch_algorithm(const std::string& alg_name) {
+inline void randombytes_switch_algorithm(const std::string& alg_name) {
     if (C::OQS_randombytes_switch_algorithm(alg_name.c_str()) != C::OQS_SUCCESS)
         throw std::runtime_error("Can not switch algorithm");
 }
 
 /**
- * \brief Initializes the NIST DRBG with the \a entropy_input seed
+ * \brief Initializes the NIST DRBG with the \a entropy_input seed. The security
+ * parameter is 256 bits.
  * \param entropy_input Entropy input seed, must be exactly 48 bytes long
  * \param personalization_string Optional personalization string, which, if
  * non-empty, must be at least 48 bytes long
  */
-void randombytes_nist_kat_init(const bytes& entropy_input,
-                               const bytes& personalization_string = {}) {
+inline void
+randombytes_nist_kat_init_256bit(const bytes& entropy_input,
+                                 const bytes& personalization_string = {}) {
     std::size_t len_str = personalization_string.size();
 
     if (entropy_input.size() != 48)
@@ -87,20 +89,20 @@ void randombytes_nist_kat_init(const bytes& entropy_input,
         if (len_str < 48)
             throw std::out_of_range("The personalization string must be either "
                                     "empty or at least 48 bytes long");
-        C::OQS_randombytes_nist_kat_init(entropy_input.data(),
-                                         personalization_string.data(), 256);
+        C::OQS_randombytes_nist_kat_init_256bit(entropy_input.data(),
+                                                personalization_string.data());
         return;
     }
-    C::OQS_randombytes_nist_kat_init(entropy_input.data(), nullptr, 256);
+    C::OQS_randombytes_nist_kat_init_256bit(entropy_input.data(), nullptr);
 }
 
 /**
  * \brief Switches oqs::rand::randombytes() to use the given function
  * \note This allows additional custom RNGs besides the provided ones.
  * \param algorithm_ptr Pointer to RNG function
  */
-void randombytes_custom_algorithm(void (*algorithm_ptr)(uint8_t*,
-                                                        std::size_t)) {
+inline void randombytes_custom_algorithm(void (*algorithm_ptr)(uint8_t*,
+                                                               std::size_t)) {
     C::OQS_randombytes_custom_algorithm(algorithm_ptr);
 }
 } // namespace rand