Commit 560096f8 authored by Richard Levitte's avatar Richard Levitte
Browse files

make update 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5948)
parent 5bc6bcf8

crypto/err/openssl.txt

+3 −0
Original line number Diff line number Diff line
@@ -968,6 +968,7 @@ RAND_F_RAND_BYTES:100:RAND_bytes 
RAND_F_RAND_DRBG_ENABLE_LOCKING:119:rand_drbg_enable_locking

RAND_F_RAND_DRBG_GENERATE:107:RAND_DRBG_generate

RAND_F_RAND_DRBG_GET_ENTROPY:120:rand_drbg_get_entropy

RAND_F_RAND_DRBG_GET_NONCE:123:rand_drbg_get_nonce

RAND_F_RAND_DRBG_INSTANTIATE:108:RAND_DRBG_instantiate

RAND_F_RAND_DRBG_NEW:109:RAND_DRBG_new

RAND_F_RAND_DRBG_RESEED:110:RAND_DRBG_reseed
@@ -2403,6 +2404,8 @@ RAND_R_RANDOM_POOL_UNDERFLOW:134:random pool underflow 
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_TOO_LITTLE_NONCE_REQUESTED:135:too little nonce requested

RAND_R_TOO_MUCH_NONCE_REQUESTED:136:too much nonce requested

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

crypto/rand/rand_err.c

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ static const ERR_STRING_DATA RAND_str_functs[] = { 
     "RAND_DRBG_generate"},

    {ERR_PACK(ERR_LIB_RAND, RAND_F_RAND_DRBG_GET_ENTROPY, 0),

     "rand_drbg_get_entropy"},

    {ERR_PACK(ERR_LIB_RAND, RAND_F_RAND_DRBG_GET_NONCE, 0),

     "rand_drbg_get_nonce"},

    {ERR_PACK(ERR_LIB_RAND, RAND_F_RAND_DRBG_INSTANTIATE, 0),

     "RAND_DRBG_instantiate"},

    {ERR_PACK(ERR_LIB_RAND, RAND_F_RAND_DRBG_NEW, 0), "RAND_DRBG_new"},
@@ -107,6 +109,10 @@ 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_TOO_LITTLE_NONCE_REQUESTED),

    "too little nonce requested"},

    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_TOO_MUCH_NONCE_REQUESTED),

    "too much nonce requested"},

    {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),

include/openssl/randerr.h

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ int ERR_load_RAND_strings(void); 
# define RAND_F_RAND_DRBG_ENABLE_LOCKING                  119

# define RAND_F_RAND_DRBG_GENERATE                        107

# define RAND_F_RAND_DRBG_GET_ENTROPY                     120

# define RAND_F_RAND_DRBG_GET_NONCE                       123

# define RAND_F_RAND_DRBG_INSTANTIATE                     108

# define RAND_F_RAND_DRBG_NEW                             109

# define RAND_F_RAND_DRBG_RESEED                          110
@@ -79,6 +80,8 @@ int ERR_load_RAND_strings(void); 
# define RAND_R_REQUEST_TOO_LARGE_FOR_DRBG                117

# define RAND_R_RESEED_ERROR                              118

# define RAND_R_SELFTEST_FAILURE                          119

# define RAND_R_TOO_LITTLE_NONCE_REQUESTED                135

# define RAND_R_TOO_MUCH_NONCE_REQUESTED                  136

# define RAND_R_UNSUPPORTED_DRBG_FLAGS                    132

# define RAND_R_UNSUPPORTED_DRBG_TYPE                     120