Commit 31393fd9 authored by Dr. Matthias St. Pierre's avatar Dr. Matthias St. Pierre
Browse files

RAND_DRBG: add a function for setting the default DRBG type and flags 



This commit adds a new api RAND_DRBG_set_defaults() which sets the
default type and flags for new DRBG instances. See also #5576.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5632)
parent 80f27877

crypto/err/openssl.txt

+2 −0
Original line number Diff line number Diff line
@@ -916,6 +916,7 @@ RAND_F_RAND_DRBG_NEW:109:RAND_DRBG_new 
RAND_F_RAND_DRBG_RESEED:110:RAND_DRBG_reseed

RAND_F_RAND_DRBG_RESTART:102:rand_drbg_restart

RAND_F_RAND_DRBG_SET:104:RAND_DRBG_set

RAND_F_RAND_DRBG_SET_DEFAULTS:121:RAND_DRBG_set_defaults

RAND_F_RAND_DRBG_UNINSTANTIATE:118:RAND_DRBG_uninstantiate

RAND_F_RAND_LOAD_FILE:111:RAND_load_file

RAND_F_RAND_POOL_ADD:103:rand_pool_add
@@ -2314,6 +2315,7 @@ RAND_R_RANDOM_POOL_OVERFLOW:125:random pool overflow 
RAND_R_REQUEST_TOO_LARGE_FOR_DRBG:117:request too large for drbg

RAND_R_RESEED_ERROR:118:reseed error

RAND_R_SELFTEST_FAILURE:119:selftest failure

RAND_R_UNSUPPORTED_DRBG_FLAGS:132:unsupported drbg flags

RAND_R_UNSUPPORTED_DRBG_TYPE:120:unsupported drbg type

RSA_R_ALGORITHM_MISMATCH:100:algorithm mismatch

RSA_R_BAD_E_VALUE:101:bad e value

crypto/rand/drbg_ctr.c

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ int drbg_ctr_init(RAND_DRBG *drbg) 
    RAND_DRBG_CTR *ctr = &drbg->data.ctr;

    size_t keylen;



    switch (drbg->nid) {

    switch (drbg->type) {

    default:

        /* This can't happen, but silence the compiler warning. */

        return 0;

crypto/rand/drbg_lib.c

+49 −6
Original line number Diff line number Diff line
@@ -113,6 +113,11 @@ static const char ossl_pers_string[] = "OpenSSL NIST SP 800-90A DRBG"; 


static CRYPTO_ONCE rand_drbg_init = CRYPTO_ONCE_STATIC_INIT;







static int rand_drbg_type = RAND_DRBG_TYPE;

static unsigned int rand_drbg_flags = RAND_DRBG_FLAGS;



static unsigned int master_reseed_interval = MASTER_RESEED_INTERVAL;

static unsigned int slave_reseed_interval  = SLAVE_RESEED_INTERVAL;
@@ -127,19 +132,26 @@ static RAND_DRBG *rand_drbg_new(int secure, 
                                RAND_DRBG *parent);



/*

 * Set/initialize |drbg| to be of type |nid|, with optional |flags|.

 * Set/initialize |drbg| to be of type |type|, with optional |flags|.

 *

 * If |type| and |flags| are zero, use the defaults

 *

 * Returns 1 on success, 0 on failure.

 */

int RAND_DRBG_set(RAND_DRBG *drbg, int nid, unsigned int flags)

int RAND_DRBG_set(RAND_DRBG *drbg, int type, unsigned int flags)

{

    int ret = 1;



    if (type == 0 && flags == 0) {

        type = rand_drbg_type;

        flags = rand_drbg_flags;

    }



    drbg->state = DRBG_UNINITIALISED;

    drbg->flags = flags;

    drbg->nid = nid;

    drbg->type = type;



    switch (nid) {

    switch (type) {

    default:

        RANDerr(RAND_F_RAND_DRBG_SET, RAND_R_UNSUPPORTED_DRBG_TYPE);

        return 0;
@@ -158,6 +170,37 @@ int RAND_DRBG_set(RAND_DRBG *drbg, int nid, unsigned int flags) 
    return ret;

}



/*

 * Set/initialize default |type| and |flag| for new drbg instances.

 *

 * Returns 1 on success, 0 on failure.

 */

int RAND_DRBG_set_defaults(int type, unsigned int flags)

{

    int ret = 1;



    switch (type) {

    default:

        RANDerr(RAND_F_RAND_DRBG_SET_DEFAULTS, RAND_R_UNSUPPORTED_DRBG_TYPE);

        return 0;

    case NID_aes_128_ctr:

    case NID_aes_192_ctr:

    case NID_aes_256_ctr:

        break;

    }



    if ((flags & ~RAND_DRBG_USED_FLAGS) != 0) {

        RANDerr(RAND_F_RAND_DRBG_SET_DEFAULTS, RAND_R_UNSUPPORTED_DRBG_FLAGS);

        return 0;

    }



    rand_drbg_type  = type;

    rand_drbg_flags = flags;



    return ret;

}





/*

 * Allocate memory and initialize a new DRBG. The DRBG is allocated on

 * the secure heap if |secure| is nonzero and the secure heap is enabled.
@@ -357,7 +400,7 @@ int RAND_DRBG_uninstantiate(RAND_DRBG *drbg) 
     * initial values.

     */

    drbg->meth->uninstantiate(drbg);

    return RAND_DRBG_set(drbg, drbg->nid, drbg->flags);

    return RAND_DRBG_set(drbg, drbg->type, drbg->flags);

}



/*
@@ -849,7 +892,7 @@ static RAND_DRBG *drbg_setup(RAND_DRBG *parent) 
{

    RAND_DRBG *drbg;



    drbg = RAND_DRBG_secure_new(RAND_DRBG_NID, 0, parent);

    drbg = RAND_DRBG_secure_new(rand_drbg_type, rand_drbg_flags, parent);

    if (drbg == NULL)

        return NULL;

crypto/rand/rand_err.c

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ static const ERR_STRING_DATA RAND_str_functs[] = { 
    {ERR_PACK(ERR_LIB_RAND, RAND_F_RAND_DRBG_RESEED, 0), "RAND_DRBG_reseed"},

    {ERR_PACK(ERR_LIB_RAND, RAND_F_RAND_DRBG_RESTART, 0), "rand_drbg_restart"},

    {ERR_PACK(ERR_LIB_RAND, RAND_F_RAND_DRBG_SET, 0), "RAND_DRBG_set"},

    {ERR_PACK(ERR_LIB_RAND, RAND_F_RAND_DRBG_SET_DEFAULTS, 0),

     "RAND_DRBG_set_defaults"},

    {ERR_PACK(ERR_LIB_RAND, RAND_F_RAND_DRBG_UNINSTANTIATE, 0),

     "RAND_DRBG_uninstantiate"},

    {ERR_PACK(ERR_LIB_RAND, RAND_F_RAND_LOAD_FILE, 0), "RAND_load_file"},
@@ -99,6 +101,8 @@ static const ERR_STRING_DATA RAND_str_reasons[] = { 
    "request too large for drbg"},

    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RESEED_ERROR), "reseed error"},

    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_SELFTEST_FAILURE), "selftest failure"},

    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNSUPPORTED_DRBG_FLAGS),

    "unsupported drbg flags"},

    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNSUPPORTED_DRBG_TYPE),

    "unsupported drbg type"},

    {0, NULL}

crypto/rand/rand_lcl.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ struct rand_drbg_st { 
    CRYPTO_RWLOCK *lock;

    RAND_DRBG *parent;

    int secure; /* 1: allocated on the secure heap, 0: otherwise */

    int nid; /* the underlying algorithm */

    int type; /* the nid of the underlying algorithm */

    int fork_count;

    unsigned short flags; /* various external flags */