diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:21:38 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:21:38 +0200 |
| commit | d09435a9d2adb0d0cafa0b1f9f6cfe326346cbc6 (patch) | |
| tree | 946278cd836aa6af639675f4eb5ec7378d783dd8 /app/openssl/crypto/rand/rand_err.c | |
| parent | 5d47fde84a03acb1201f8650c55dc0cd981df679 (diff) | |
| parent | 3a71bc9e4aa4296f460e2e3c55de74c9852477ad (diff) | |
Merge branch 'develop' into release-0.5.2
Diffstat (limited to 'app/openssl/crypto/rand/rand_err.c')
| -rw-r--r-- | app/openssl/crypto/rand/rand_err.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/openssl/crypto/rand/rand_err.c b/app/openssl/crypto/rand/rand_err.c index 03cda4dd..c4c80fc8 100644 --- a/app/openssl/crypto/rand/rand_err.c +++ b/app/openssl/crypto/rand/rand_err.c @@ -1,6 +1,6 @@ /* crypto/rand/rand_err.c */ /* ==================================================================== - * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -71,12 +71,17 @@ static ERR_STRING_DATA RAND_str_functs[]= { {ERR_FUNC(RAND_F_RAND_GET_RAND_METHOD), "RAND_get_rand_method"}, +{ERR_FUNC(RAND_F_RAND_INIT_FIPS), "RAND_init_fips"}, {ERR_FUNC(RAND_F_SSLEAY_RAND_BYTES), "SSLEAY_RAND_BYTES"}, {0,NULL} }; static ERR_STRING_DATA RAND_str_reasons[]= { +{ERR_REASON(RAND_R_DUAL_EC_DRBG_DISABLED),"dual ec drbg disabled"}, +{ERR_REASON(RAND_R_ERROR_INITIALISING_DRBG),"error initialising drbg"}, +{ERR_REASON(RAND_R_ERROR_INSTANTIATING_DRBG),"error instantiating drbg"}, +{ERR_REASON(RAND_R_NO_FIPS_RANDOM_METHOD_SET),"no fips random method set"}, {ERR_REASON(RAND_R_PRNG_NOT_SEEDED) ,"PRNG not seeded"}, {0,NULL} }; |