aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/rand
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-01-26 15:33:51 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-01-26 15:33:51 +0000
commit1588a3cae72e60071f1f8a89dbd1356bc08581fc (patch)
tree87425e4d1194d73d1b7b567382a78e76645994b8 /crypto/rand
parent7a4bd34a4f6d0c0745dd5710c0f4dba614e8dfac (diff)
downloadopenssl-1588a3cae72e60071f1f8a89dbd1356bc08581fc.tar.gz
add new RAND errors
Diffstat (limited to 'crypto/rand')
-rw-r--r--crypto/rand/rand.h10
-rw-r--r--crypto/rand/rand_err.c12
2 files changed, 21 insertions, 1 deletions
diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index 5895d3b6e1..7a3a79b44f 100644
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.h
@@ -128,11 +128,21 @@ void ERR_load_RAND_strings(void);
/* Error codes for the RAND functions. */
/* Function codes. */
+#define RAND_F_FIPS_RAND 102
+#define RAND_F_FIPS_RAND_SET_DT 103
+#define RAND_F_FIPS_SET_PRNG_SEED 104
+#define RAND_F_FIPS_SET_TEST_MODE 105
#define RAND_F_RAND_GET_RAND_METHOD 101
#define RAND_F_SSLEAY_RAND_BYTES 100
/* Reason codes. */
+#define RAND_R_NOT_IN_TEST_MODE 101
+#define RAND_R_NO_KEY_SET 102
+#define RAND_R_PRNG_ERROR 103
+#define RAND_R_PRNG_KEYED 104
#define RAND_R_PRNG_NOT_SEEDED 100
+#define RAND_R_PRNG_SEED_MUST_NOT_MATCH_KEY 105
+#define RAND_R_PRNG_STUCK 106
#ifdef __cplusplus
}
diff --git a/crypto/rand/rand_err.c b/crypto/rand/rand_err.c
index 03cda4dd92..1997752d14 100644
--- a/crypto/rand/rand_err.c
+++ b/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-2010 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
@@ -70,6 +70,10 @@
static ERR_STRING_DATA RAND_str_functs[]=
{
+{ERR_FUNC(RAND_F_FIPS_RAND), "FIPS_RAND"},
+{ERR_FUNC(RAND_F_FIPS_RAND_SET_DT), "FIPS_RAND_SET_DT"},
+{ERR_FUNC(RAND_F_FIPS_SET_PRNG_SEED), "FIPS_SET_PRNG_SEED"},
+{ERR_FUNC(RAND_F_FIPS_SET_TEST_MODE), "FIPS_SET_TEST_MODE"},
{ERR_FUNC(RAND_F_RAND_GET_RAND_METHOD), "RAND_get_rand_method"},
{ERR_FUNC(RAND_F_SSLEAY_RAND_BYTES), "SSLEAY_RAND_BYTES"},
{0,NULL}
@@ -77,7 +81,13 @@ static ERR_STRING_DATA RAND_str_functs[]=
static ERR_STRING_DATA RAND_str_reasons[]=
{
+{ERR_REASON(RAND_R_NOT_IN_TEST_MODE) ,"not in test mode"},
+{ERR_REASON(RAND_R_NO_KEY_SET) ,"no key set"},
+{ERR_REASON(RAND_R_PRNG_ERROR) ,"prng error"},
+{ERR_REASON(RAND_R_PRNG_KEYED) ,"prng keyed"},
{ERR_REASON(RAND_R_PRNG_NOT_SEEDED) ,"PRNG not seeded"},
+{ERR_REASON(RAND_R_PRNG_SEED_MUST_NOT_MATCH_KEY),"prng seed must not match key"},
+{ERR_REASON(RAND_R_PRNG_STUCK) ,"prng stuck"},
{0,NULL}
};