Commit 02e483d2 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix more error codes.

parent 1a58139a

crypto/dsa/dsa.h

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ void ERR_load_DSA_strings(void); 
#define DSA_F_D2I_DSA_SIG				 110

#define DSA_F_DSAPARAMS_PRINT				 100

#define DSA_F_DSAPARAMS_PRINT_FP			 101

#define DSA_F_DSA_BUILTIN_PARAMGEN			 118

#define DSA_F_DSA_DO_SIGN				 112

#define DSA_F_DSA_DO_VERIFY				 113

#define DSA_F_DSA_GENERATE_PARAMETERS			 117

crypto/dsa/dsa_err.c

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static ERR_STRING_DATA DSA_str_functs[]= 
{ERR_FUNC(DSA_F_D2I_DSA_SIG),	"d2i_DSA_SIG"},

{ERR_FUNC(DSA_F_DSAPARAMS_PRINT),	"DSAparams_print"},

{ERR_FUNC(DSA_F_DSAPARAMS_PRINT_FP),	"DSAparams_print_fp"},

{ERR_FUNC(DSA_F_DSA_BUILTIN_PARAMGEN),	"DSA_BUILTIN_PARAMGEN"},

{ERR_FUNC(DSA_F_DSA_DO_SIGN),	"DSA_do_sign"},

{ERR_FUNC(DSA_F_DSA_DO_VERIFY),	"DSA_do_verify"},

{ERR_FUNC(DSA_F_DSA_GENERATE_PARAMETERS),	"DSA_generate_parameters"},

crypto/fips_err.h

+11 −11
Original line number Diff line number Diff line
@@ -70,29 +70,29 @@ 


static ERR_STRING_DATA FIPS_str_functs[]=

	{

{ERR_FUNC(FIPS_F_DH_GENERATE_PARAMETERS),	"DH_generate_parameters"},

{ERR_FUNC(FIPS_F_DH_BUILTIN_GENPARAMS),	"DH_BUILTIN_GENPARAMS"},

{ERR_FUNC(FIPS_F_DSA_BUILTIN_PARAMGEN),	"DSA_BUILTIN_PARAMGEN"},

{ERR_FUNC(FIPS_F_DSA_DO_SIGN),	"DSA_do_sign"},

{ERR_FUNC(FIPS_F_DSA_DO_VERIFY),	"DSA_do_verify"},

{ERR_FUNC(FIPS_F_DSA_GENERATE_PARAMETERS),	"DSA_generate_parameters"},

{ERR_FUNC(FIPS_F_FIPS_CHECK_DSA),	"FIPS_CHECK_DSA"},

{ERR_FUNC(FIPS_F_FIPS_CHECK_DSO),	"FIPS_CHECK_DSO"},

{ERR_FUNC(FIPS_F_FIPS_CHECK_EXE),	"FIPS_CHECK_EXE"},

{ERR_FUNC(FIPS_F_FIPS_CHECK_FINGERPRINT),	"FIPS_CHECK_FINGERPRINT"},

{ERR_FUNC(FIPS_F_FIPS_CHECK_PK_SIG),	"FIPS_CHECK_PK_SIG"},

{ERR_FUNC(FIPS_F_FIPS_CHECK_INCORE_FINGERPRINT),	"FIPS_CHECK_INCORE_FINGERPRINT"},

{ERR_FUNC(FIPS_F_FIPS_CHECK_RSA),	"FIPS_CHECK_RSA"},

{ERR_FUNC(FIPS_F_FIPS_DSA_CHECK),	"FIPS_dsa_check"},

{ERR_FUNC(FIPS_F_FIPS_DSA_CHECK),	"FIPS_DSA_CHECK"},

{ERR_FUNC(FIPS_F_FIPS_MODE_SET),	"FIPS_mode_set"},

{ERR_FUNC(FIPS_F_FIPS_PKEY_SIGNATURE_TEST),	"fips_pkey_signature_test"},

{ERR_FUNC(FIPS_F_FIPS_SELFTEST_AES),	"FIPS_selftest_aes"},

{ERR_FUNC(FIPS_F_FIPS_SELFTEST_DES),	"FIPS_selftest_des"},

{ERR_FUNC(FIPS_F_FIPS_SELFTEST_DSA),	"FIPS_selftest_dsa"},

{ERR_FUNC(FIPS_F_FIPS_SELFTEST_HMAC),	"FIPS_selftest_hmac"},

{ERR_FUNC(FIPS_F_FIPS_SELFTEST_RNG),	"FIPS_selftest_rng"},

{ERR_FUNC(FIPS_F_FIPS_SELFTEST_RSA),	"FIPS_selftest_rsa"},

{ERR_FUNC(FIPS_F_FIPS_SELFTEST_SHA),	"FIPS_SELFTEST_SHA"},

{ERR_FUNC(FIPS_F_FIPS_SELFTEST_SHA1),	"FIPS_selftest_sha1"},

{ERR_FUNC(FIPS_F_HASH_FINAL),	"HASH_FINAL"},

{ERR_FUNC(FIPS_F_RSA_BUILTIN_KEYGEN),	"RSA_BUILTIN_KEYGEN"},

{ERR_FUNC(FIPS_F_RSA_EAY_PRIVATE_DECRYPT),	"RSA_EAY_PRIVATE_DECRYPT"},

{ERR_FUNC(FIPS_F_RSA_EAY_PRIVATE_ENCRYPT),	"RSA_EAY_PRIVATE_ENCRYPT"},

{ERR_FUNC(FIPS_F_RSA_EAY_PUBLIC_DECRYPT),	"RSA_EAY_PUBLIC_DECRYPT"},

{ERR_FUNC(FIPS_F_RSA_EAY_PUBLIC_ENCRYPT),	"RSA_EAY_PUBLIC_ENCRYPT"},

{ERR_FUNC(FIPS_F_RSA_GENERATE_KEY),	"RSA_generate_key"},

{ERR_FUNC(FIPS_F_RSA_X931_GENERATE_KEY),	"RSA_X931_generate_key"},

{ERR_FUNC(FIPS_F_RSA_X931_GENERATE_KEY_EX),	"RSA_X931_generate_key_ex"},

{ERR_FUNC(FIPS_F_SSLEAY_RAND_BYTES),	"SSLEAY_RAND_BYTES"},

{0,NULL}

	};

crypto/rand/rand.h

+3 −0
Original line number Diff line number Diff line
@@ -139,7 +139,9 @@ void ERR_load_RAND_strings(void); 
/* Function codes. */

#define RAND_F_FIPS_RAND				 103

#define RAND_F_FIPS_RAND_BYTES				 102

#define RAND_F_FIPS_RAND_SET_DT				 106

#define RAND_F_FIPS_SET_DT				 104

#define RAND_F_FIPS_SET_PRNG_SEED			 107

#define RAND_F_FIPS_SET_TEST_MODE			 105

#define RAND_F_RAND_GET_RAND_METHOD			 101

#define RAND_F_SSLEAY_RAND_BYTES			 100
@@ -154,6 +156,7 @@ void ERR_load_RAND_strings(void); 
#define RAND_R_PRNG_NOT_REKEYED				 102

#define RAND_R_PRNG_NOT_RESEEDED			 103

#define RAND_R_PRNG_NOT_SEEDED				 100

#define RAND_R_PRNG_SEED_MUST_NOT_MATCH_KEY		 110

#define RAND_R_PRNG_STUCK				 104



#ifdef  __cplusplus

crypto/rand/rand_err.c

+4 −1
Original line number Diff line number Diff line 
/* crypto/rand/rand_err.c */

/* ====================================================================

 * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2007 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
@@ -72,7 +72,9 @@ static ERR_STRING_DATA RAND_str_functs[]= 
	{

{ERR_FUNC(RAND_F_FIPS_RAND),	"FIPS_RAND"},

{ERR_FUNC(RAND_F_FIPS_RAND_BYTES),	"FIPS_RAND_BYTES"},

{ERR_FUNC(RAND_F_FIPS_RAND_SET_DT),	"FIPS_RAND_SET_DT"},

{ERR_FUNC(RAND_F_FIPS_SET_DT),	"FIPS_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"},
@@ -90,6 +92,7 @@ static ERR_STRING_DATA RAND_str_reasons[]= 
{ERR_REASON(RAND_R_PRNG_NOT_REKEYED)     ,"prng not rekeyed"},

{ERR_REASON(RAND_R_PRNG_NOT_RESEEDED)    ,"prng not reseeded"},

{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}

	};