diff options
author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2018-03-05 23:45:44 +0100 |
---|---|---|
committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2018-03-15 18:58:38 +0100 |
commit | 6decf9436f77ff65ed8ed773268663a9273cfbc8 (patch) | |
tree | d22016d214eff4f34e7ffa34f754cf0d25552379 /crypto/evp | |
parent | Add code to run test, get malloc counts (diff) | |
download | openssl-6decf9436f77ff65ed8ed773268663a9273cfbc8.tar.xz openssl-6decf9436f77ff65ed8ed773268663a9273cfbc8.zip |
Publish the RAND_DRBG API
Fixes #4403
This commit moves the internal header file "internal/rand.h" to
<openssl/rand_drbg.h>, making the RAND_DRBG API public.
The RAND_POOL API remains private, its function prototypes were
moved to "internal/rand_int.h" and converted to lowercase.
Documentation for the new API is work in progress on GitHub #5461.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5462)
Diffstat (limited to 'crypto/evp')
-rw-r--r-- | crypto/evp/e_aes.c | 2 | ||||
-rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha1.c | 2 | ||||
-rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha256.c | 2 | ||||
-rw-r--r-- | crypto/evp/e_aria.c | 2 | ||||
-rw-r--r-- | crypto/evp/e_des.c | 2 | ||||
-rw-r--r-- | crypto/evp/e_des3.c | 2 | ||||
-rw-r--r-- | crypto/evp/evp_enc.c | 2 | ||||
-rw-r--r-- | crypto/evp/p_seal.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index bed9b2743e..2421385425 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -17,7 +17,7 @@ #include "internal/evp_int.h" #include "modes_lcl.h" #include <openssl/rand.h> -#include <internal/rand.h> +#include <openssl/rand_drbg.h> #include "evp_locl.h" typedef struct { diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index 053189e685..ac564a20f8 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -17,7 +17,7 @@ #include <openssl/aes.h> #include <openssl/sha.h> #include <openssl/rand.h> -#include <internal/rand.h> +#include <openssl/rand_drbg.h> #include "modes_lcl.h" #include "internal/evp_int.h" #include "internal/constant_time_locl.h" diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index 215e02f131..e752d304b6 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -18,7 +18,7 @@ #include <openssl/aes.h> #include <openssl/sha.h> #include <openssl/rand.h> -#include <internal/rand.h> +#include <openssl/rand_drbg.h> #include "modes_lcl.h" #include "internal/constant_time_locl.h" #include "internal/evp_int.h" diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c index 10525a84d9..9c1036b4bd 100644 --- a/crypto/evp/e_aria.c +++ b/crypto/evp/e_aria.c @@ -13,9 +13,9 @@ # include <openssl/evp.h> # include <openssl/modes.h> # include <openssl/rand.h> +# include <openssl/rand_drbg.h> # include "internal/aria.h" # include "internal/evp_int.h" -# include "internal/rand.h" # include "modes_lcl.h" # include "evp_locl.h" diff --git a/crypto/evp/e_des.c b/crypto/evp/e_des.c index d8c4afa886..3b4b714e38 100644 --- a/crypto/evp/e_des.c +++ b/crypto/evp/e_des.c @@ -15,7 +15,7 @@ # include "internal/evp_int.h" # include <openssl/des.h> # include <openssl/rand.h> -# include <internal/rand.h> +# include <openssl/rand_drbg.h> # include "evp_locl.h" typedef struct { diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c index 75e6ecf314..b8fe42cb96 100644 --- a/crypto/evp/e_des3.c +++ b/crypto/evp/e_des3.c @@ -15,7 +15,7 @@ # include "internal/evp_int.h" # include <openssl/des.h> # include <openssl/rand.h> -# include <internal/rand.h> +# include <openssl/rand_drbg.h> # include "evp_locl.h" typedef struct { diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 3176c61538..9832e562b2 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -13,9 +13,9 @@ #include <openssl/evp.h> #include <openssl/err.h> #include <openssl/rand.h> +#include <openssl/rand_drbg.h> #include <openssl/engine.h> #include "internal/evp_int.h" -#include "internal/rand.h" #include "evp_locl.h" int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c) diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c index 3b79dab8b8..731879330b 100644 --- a/crypto/evp/p_seal.c +++ b/crypto/evp/p_seal.c @@ -14,7 +14,7 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> -#include <internal/rand.h> +#include <openssl/rand_drbg.h> #include "evp_locl.h" int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, |