OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Dr.
Stephen Henson
Root: /v/openssl/cvs Email: steve openssl.org
Module: openssl Date:
14-Aug-2007 18:00:53
Branch: OpenSSL-fips-0_9_8-stable Handle:
2007081417004210
Modified files: (Branch:
OpenSSL-fips-0_9_8-stable)
openssl/crypto/err err_str.c
openssl/crypto/evp dig_eng.c digest.c enc_min.c
evp.h evp_enc.c
evp_err.c
openssl/crypto/rand rand.h rand_eng.c rand_err.c
rand_lib.c
openssl/crypto/rsa rsa.h rsa_eng.c rsa_err.c
Log:
Fix remaining error code discrepancies.
Summary:
Revision Changes Path
1.1.4.3 +1 -1 openssl/crypto/err/err_str.c
1.1.2.3 +3 -3 openssl/crypto/evp/dig_eng.c
1.30.4.4 +4 -4 openssl/crypto/evp/digest.c
1.1.2.3 +3 -3 openssl/crypto/evp/enc_min.c
1.112.2.4.2.7+5 -1 openssl/crypto/evp/evp.h
1.42.2.3.2.3+2 -2 openssl/crypto/evp/evp_enc.c
1.28.2.2.2.3+5 -0 openssl/crypto/evp/evp_err.c
1.32.4.3 +2 -0 openssl/crypto/rand/rand.h
1.1.2.2 +1 -1 openssl/crypto/rand/rand_eng.c
1.7.2.1.2.3 +2 -0 openssl/crypto/rand/rand_err.c
1.16.2.1.2.2+1 -1 openssl/crypto/rand/rand_lib.c
1.55.2.7.2.7+1 -0 openssl/crypto/rsa/rsa.h
1.1.2.3 +2 -2 openssl/crypto/rsa/rsa_eng.c
1.17.2.7.2.3+1 -0 openssl/crypto/rsa/rsa_err.c
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/crypto/err/err_str.c
============================================================
================
$ cvs diff -u -r1.1.4.2 -r1.1.4.3 err_str.c
--- openssl/crypto/err/err_str.c 22 Mar 2007 00:38:08
-0000 1.1.4.2
+++ openssl/crypto/err/err_str.c 14 Aug 2007 16:00:42
-0000 1.1.4.3
-223,7 +223,7
* others will be displayed numerically by
ERR_error_string.
* It is crucial that we have something for each reason
code
* that occurs in ERR_str_reasons, or bogus reason
strings
- * will be returned for SYSerr(), which always gets an
errno
+ * will be returned for SYSerr, which always gets an
errno
* value and never one of those 'standard' reason codes.
*/
static void build_SYS_str_reasons(void)
.
patch -p0 <<' .'
Index: openssl/crypto/evp/dig_eng.c
============================================================
================
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 dig_eng.c
--- openssl/crypto/evp/dig_eng.c 1 Jul 2007 00:07:23
-0000 1.1.2.2
+++ openssl/crypto/evp/dig_eng.c 14 Aug 2007 16:00:43
-0000 1.1.2.3
-135,7 +135,7
{
if (!ENGINE_init(impl))
{
- EVPerr(EVP_F_EVP_DIGESTINIT_EX,EVP_R_INITIALIZATION_ERR
OR);
+ EVPerr(EVP_F_DO_EVP_MD_ENGINE_FULL,EVP_R_INITIALIZATION
_ERROR);
return 0;
}
}
-149,7 +149,7
if(!d)
{
/* Same comment from evp_enc.c */
- EVPerr(EVP_F_EVP_DIGESTINIT_EX,EVP_R_INITIALIZATION_ERR
OR);
+ EVPerr(EVP_F_DO_EVP_MD_ENGINE_FULL,EVP_R_INITIALIZATION
_ERROR);
return 0;
}
/* We'll use the ENGINE's private digest definition
*/
-165,7 +165,7
else
if(!ctx->digest)
{
- EVPerr(EVP_F_EVP_DIGESTINIT_EX,EVP_R_NO_DIGEST_SET);
+ EVPerr(EVP_F_DO_EVP_MD_ENGINE_FULL,EVP_R_NO_DIGEST_SET);
return 0;
}
return 1;
.
patch -p0 <<' .'
Index: openssl/crypto/evp/digest.c
============================================================
================
$ cvs diff -u -r1.30.4.3 -r1.30.4.4 digest.c
--- openssl/crypto/evp/digest.c 2 Jul 2007 11:22:49
-0000 1.30.4.3
+++ openssl/crypto/evp/digest.c 14 Aug 2007 16:00:43
-0000 1.30.4.4
-222,7 +222,7
{
if (!ENGINE_init(impl))
{
- EVPerr(EVP_F_EVP_DIGESTINIT_EX,EVP_R_INITIALIZATION_ERR
OR);
+ EVPerr(EVP_F_DO_EVP_MD_ENGINE,EVP_R_INITIALIZATION_ERRO
R);
return 0;
}
}
-236,7 +236,7
if(!d)
{
/* Same comment from evp_enc.c */
- EVPerr(EVP_F_EVP_DIGESTINIT_EX,EVP_R_INITIALIZATION_ERR
OR);
+ EVPerr(EVP_F_DO_EVP_MD_ENGINE,EVP_R_INITIALIZATION_ERRO
R);
return 0;
}
/* We'll use the ENGINE's private digest definition
*/
-252,7 +252,7
else
if(!ctx->digest)
{
- EVPerr(EVP_F_EVP_DIGESTINIT_EX,EVP_R_NO_DIGEST_SET);
+ EVPerr(EVP_F_DO_EVP_MD_ENGINE,EVP_R_NO_DIGEST_SET);
return 0;
}
return 1;
-284,7 +284,7
if (!(type->flags & EVP_MD_FLAG_FIPS)
&& !(ctx->flags &
EVP_MD_CTX_FLAG_NON_FIPS_ALLOW))
{
- EVPerr(EVP_F_EVP_DIGESTINIT,
EVP_R_DISABLED_FOR_FIPS);
+ EVPerr(EVP_F_EVP_DIGESTINIT_EX,
EVP_R_DISABLED_FOR_FIPS);
ctx->digest = &bad_md;
return 0;
}
.
patch -p0 <<' .'
Index: openssl/crypto/evp/enc_min.c
============================================================
================
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 enc_min.c
--- openssl/crypto/evp/enc_min.c 2 Jul 2007 11:22:49
-0000 1.1.2.2
+++ openssl/crypto/evp/enc_min.c 14 Aug 2007 16:00:44
-0000 1.1.2.3
-152,7 +152,7
{
if (!ENGINE_init(impl))
{
- EVPerr(EVP_F_EVP_CIPHERINIT_EX,
EVP_R_INITIALIZATION_ERROR);
+ EVPerr(EVP_F_DO_EVP_ENC_ENGINE,
EVP_R_INITIALIZATION_ERROR);
return 0;
}
}
-169,7 +169,7
* control history, is that we should at least
* be able to avoid using US mispellings of
* "initialisation"? */
- EVPerr(EVP_F_EVP_CIPHERINIT_EX,
EVP_R_INITIALIZATION_ERROR);
+ EVPerr(EVP_F_DO_EVP_ENC_ENGINE,
EVP_R_INITIALIZATION_ERROR);
return 0;
}
/* We'll use the ENGINE's private cipher definition */
-295,7 +295,7
if (!(ctx->cipher->flags &
EVP_CIPH_FLAG_FIPS)
& !(ctx->flags &
EVP_CIPH_FLAG_NON_FIPS_ALLOW))
{
- EVPerr(EVP_F_EVP_CIPHERINIT,
EVP_R_DISABLED_FOR_FIPS);
+ EVPerr(EVP_F_EVP_CIPHERINIT_EX,
EVP_R_DISABLED_FOR_FIPS);
#if 0
ERR_add_error_data(2, "cipher=",
EVP_CIPHER_name(ctx->cipher));
.
patch -p0 <<' .'
Index: openssl/crypto/evp/evp.h
============================================================
================
$ cvs diff -u -r1.112.2.4.2.6 -r1.112.2.4.2.7 evp.h
--- openssl/crypto/evp/evp.h 1 Jul 2007 12:53:09
-0000 1.112.2.4.2.6
+++ openssl/crypto/evp/evp.h 14 Aug 2007 16:00:45
-0000 1.112.2.4.2.7
-956,6 +956,10
#define EVP_F_ALG_MODULE_INIT 138
#define EVP_F_CAMELLIA_INIT_KEY 159
#define EVP_F_D2I_PKEY 100
+#define EVP_F_DO_EVP_ENC_ENGINE 140
+#define EVP_F_DO_EVP_ENC_ENGINE_FULL 141
+#define EVP_F_DO_EVP_MD_ENGINE 139
+#define EVP_F_DO_EVP_MD_ENGINE_FULL 142
#define EVP_F_DSAPKEY2PKCS8 134
#define EVP_F_DSA_PKEY2PKCS8 135
#define EVP_F_ECDSA_PKEY2PKCS8 129
-1032,6 +1036,7
#define EVP_R_NO_VERIFY_FUNCTION_CONFIGURED 105
#define EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE 117
#define EVP_R_PUBLIC_KEY_NOT_RSA 106
+#define EVP_R_SEED_KEY_SETUP_FAILED 162
#define EVP_R_UNKNOWN_OPTION 149
#define EVP_R_UNKNOWN_PBE_ALGORITHM 121
#define EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS 135
-1044,7 +1049,6
#define EVP_R_UNSUPPORTED_SALT_TYPE 126
#define EVP_R_WRONG_FINAL_BLOCK_LENGTH 109
#define EVP_R_WRONG_PUBLIC_KEY_TYPE 110
-#define EVP_R_SEED_KEY_SETUP_FAILED 162
#ifdef __cplusplus
}
.
patch -p0 <<' .'
Index: openssl/crypto/evp/evp_enc.c
============================================================
================
$ cvs diff -u -r1.42.2.3.2.2 -r1.42.2.3.2.3 evp_enc.c
--- openssl/crypto/evp/evp_enc.c 1 Jul 2007 00:07:23
-0000 1.42.2.3.2.2
+++ openssl/crypto/evp/evp_enc.c 14 Aug 2007 16:00:46
-0000 1.42.2.3.2.3
-384,7 +384,7
{
if (!ENGINE_init(impl))
{
- EVPerr(EVP_F_EVP_CIPHERINIT_EX,
EVP_R_INITIALIZATION_ERROR);
+ EVPerr(EVP_F_DO_EVP_ENC_ENGINE_FULL,
EVP_R_INITIALIZATION_ERROR);
return 0;
}
}
-401,7 +401,7
* control history, is that we should at least
* be able to avoid using US mispellings of
* "initialisation"? */
- EVPerr(EVP_F_EVP_CIPHERINIT_EX,
EVP_R_INITIALIZATION_ERROR);
+ EVPerr(EVP_F_DO_EVP_ENC_ENGINE_FULL,
EVP_R_INITIALIZATION_ERROR);
return 0;
}
/* We'll use the ENGINE's private cipher definition */
.
patch -p0 <<' .'
Index: openssl/crypto/evp/evp_err.c
============================================================
================
$ cvs diff -u -r1.28.2.2.2.2 -r1.28.2.2.2.3 evp_err.c
--- openssl/crypto/evp/evp_err.c 8 Apr 2007 17:50:59
-0000 1.28.2.2.2.2
+++ openssl/crypto/evp/evp_err.c 14 Aug 2007 16:00:46
-0000 1.28.2.2.2.3
-74,6 +74,10
{ERR_FUNC(EVP_F_ALG_MODULE_INIT), "ALG_MODULE_INIT"
;},
{ERR_FUNC(EVP_F_CAMELLIA_INIT_KEY), "CAMELLIA_INIT_KEY&
quot;},
{ERR_FUNC(EVP_F_D2I_PKEY), "D2I_PKEY"},
+{ERR_FUNC(EVP_F_DO_EVP_ENC_ENGINE), "DO_EVP_ENC_ENGINE
"},
+{ERR_FUNC(EVP_F_DO_EVP_ENC_ENGINE_FULL), "DO_EVP_ENC_E
NGINE_FULL"},
+{ERR_FUNC(EVP_F_DO_EVP_MD_ENGINE), "DO_EVP_MD_ENGINE&q
uot;},
+{ERR_FUNC(EVP_F_DO_EVP_MD_ENGINE_FULL), "DO_EVP_MD_ENG
INE_FULL"},
{ERR_FUNC(EVP_F_DSAPKEY2PKCS8), "DSAPKEY2PKCS8"},
{ERR_FUNC(EVP_F_DSA_PKEY2PKCS8), "DSA_PKEY2PKCS8"}
,
{ERR_FUNC(EVP_F_ECDSA_PKEY2PKCS8), "ECDSA_PKEY2PKCS8&qu
ot;},
-153,6 +157,7
{ERR_REASON(EVP_R_NO_VERIFY_FUNCTION_CONFIGURED),"no
verify function configured"},
{ERR_REASON(EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE),"pkcs8
unknown broken type"},
{ERR_REASON(EVP_R_PUBLIC_KEY_NOT_RSA) ,"public
key not rsa"},
+{ERR_REASON(EVP_R_SEED_KEY_SETUP_FAILED) ,"seed key
setup failed"},
{ERR_REASON(EVP_R_UNKNOWN_OPTION) ,"unknown
option"},
{ERR_REASON(EVP_R_UNKNOWN_PBE_ALGORITHM) ,"unknown
pbe algorithm"},
{ERR_REASON(EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS),"unsupor
ted number of rounds"},
.
patch -p0 <<' .'
Index: openssl/crypto/rand/rand.h
============================================================
================
$ cvs diff -u -r1.32.4.2 -r1.32.4.3 rand.h
--- openssl/crypto/rand/rand.h 14 Aug 2007 13:33:29
-0000 1.32.4.2
+++ openssl/crypto/rand/rand.h 14 Aug 2007 16:00:50
-0000 1.32.4.3
-137,8 +137,10
/* Error codes for the RAND functions. */
/* Function codes. */
+#define RAND_F_ENG_RAND_GET_RAND_METHOD 108
#define RAND_F_FIPS_RAND 103
#define RAND_F_FIPS_RAND_BYTES 102
+#define RAND_F_FIPS_RAND_GET_RAND_METHOD 109
#define RAND_F_FIPS_RAND_SET_DT 106
#define RAND_F_FIPS_SET_DT 104
#define RAND_F_FIPS_SET_PRNG_SEED 107
.
patch -p0 <<' .'
Index: openssl/crypto/rand/rand_eng.c
============================================================
================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 rand_eng.c
--- openssl/crypto/rand/rand_eng.c 22 Mar 2007 00:38:28
-0000 1.1.2.1
+++ openssl/crypto/rand/rand_eng.c 14 Aug 2007 16:00:50
-0000 1.1.2.2
-109,7 +109,7
if(FIPS_mode()
&& *pmeth != FIPS_rand_check())
{
-
RANDerr(RAND_F_RAND_GET_RAND_METHOD,RAND_R_NON_FIPS_METHOD);
+
RANDerr(RAND_F_ENG_RAND_GET_RAND_METHOD,RAND_R_NON_FIPS_METH
OD);
return 0;
}
.
patch -p0 <<' .'
Index: openssl/crypto/rand/rand_err.c
============================================================
================
$ cvs diff -u -r1.7.2.1.2.2 -r1.7.2.1.2.3 rand_err.c
--- openssl/crypto/rand/rand_err.c 14 Aug 2007 13:33:29
-0000 1.7.2.1.2.2
+++ openssl/crypto/rand/rand_err.c 14 Aug 2007 16:00:51
-0000 1.7.2.1.2.3
-70,8 +70,10
static ERR_STRING_DATA RAND_str_functs[]=
{
+{ERR_FUNC(RAND_F_ENG_RAND_GET_RAND_METHOD), "ENG_RAND_
GET_RAND_METHOD"},
{ERR_FUNC(RAND_F_FIPS_RAND), "FIPS_RAND"},
{ERR_FUNC(RAND_F_FIPS_RAND_BYTES), "FIPS_RAND_BYTES&quo
t;},
+{ERR_FUNC(RAND_F_FIPS_RAND_GET_RAND_METHOD), "FIPS_RAN
D_GET_RAND_METHOD"},
{ERR_FUNC(RAND_F_FIPS_RAND_SET_DT), "FIPS_RAND_SET_DT&q
uot;},
{ERR_FUNC(RAND_F_FIPS_SET_DT), "FIPS_SET_DT"},
{ERR_FUNC(RAND_F_FIPS_SET_PRNG_SEED), "FIPS_SET_PRNG_SE
ED"},
.
patch -p0 <<' .'
Index: openssl/crypto/rand/rand_lib.c
============================================================
================
$ cvs diff -u -r1.16.2.1.2.1 -r1.16.2.1.2.2 rand_lib.c
--- openssl/crypto/rand/rand_lib.c 22 Mar 2007 00:38:28
-0000 1.16.2.1.2.1
+++ openssl/crypto/rand/rand_lib.c 14 Aug 2007 16:00:51
-0000 1.16.2.1.2.2
-91,7 +91,7
if(FIPS_mode()
&& *pmeth != FIPS_rand_check())
{
-
RANDerr(RAND_F_RAND_GET_RAND_METHOD,RAND_R_NON_FIPS_METHOD);
+
RANDerr(RAND_F_FIPS_RAND_GET_RAND_METHOD,RAND_R_NON_FIPS_MET
HOD);
return 0;
}
.
patch -p0 <<' .'
Index: openssl/crypto/rsa/rsa.h
============================================================
================
$ cvs diff -u -r1.55.2.7.2.6 -r1.55.2.7.2.7 rsa.h
--- openssl/crypto/rsa/rsa.h 14 Aug 2007 13:33:32
-0000 1.55.2.7.2.6
+++ openssl/crypto/rsa/rsa.h 14 Aug 2007 16:00:52
-0000 1.55.2.7.2.7
-443,6 +443,7
#define RSA_F_RSA_PUBLIC_DECRYPT 138
#define RSA_F_RSA_SETUP_BLINDING 136
#define RSA_F_RSA_SET_DEFAULT_METHOD 139
+#define RSA_F_RSA_SET_METHOD 142
#define RSA_F_RSA_SIGN 117
#define RSA_F_RSA_SIGN_ASN1_OCTET_STRING 118
#define RSA_F_RSA_VERIFY 119
.
patch -p0 <<' .'
Index: openssl/crypto/rsa/rsa_eng.c
============================================================
================
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 rsa_eng.c
--- openssl/crypto/rsa/rsa_eng.c 6 Apr 2007 00:30:18
-0000 1.1.2.2
+++ openssl/crypto/rsa/rsa_eng.c 14 Aug 2007 16:00:52
-0000 1.1.2.3
-121,7 +121,7
#ifdef OPENSSL_FIPS
if (FIPS_mode() && !(meth->flags &
RSA_FLAG_FIPS_METHOD))
{
- RSAerr(RSA_F_RSA_SET_DEFAULT_METHOD,
RSA_R_NON_FIPS_METHOD);
+ RSAerr(RSA_F_RSA_SET_METHOD, RSA_R_NON_FIPS_METHOD);
return 0;
}
#endif
-180,7 +180,7
#ifdef OPENSSL_FIPS
if (FIPS_mode() && !(ret->meth->flags
& RSA_FLAG_FIPS_METHOD))
{
- RSAerr(RSA_F_RSA_SET_DEFAULT_METHOD,
RSA_R_NON_FIPS_METHOD);
+ RSAerr(RSA_F_RSA_NEW_METHOD, RSA_R_NON_FIPS_METHOD);
#ifndef OPENSSL_NO_ENGINE
if (ret->engine)
ENGINE_finish(ret->engine);
.
patch -p0 <<' .'
Index: openssl/crypto/rsa/rsa_err.c
============================================================
================
$ cvs diff -u -r1.17.2.7.2.2 -r1.17.2.7.2.3 rsa_err.c
--- openssl/crypto/rsa/rsa_err.c 14 Aug 2007 13:33:32
-0000 1.17.2.7.2.2
+++ openssl/crypto/rsa/rsa_err.c 14 Aug 2007 16:00:52
-0000 1.17.2.7.2.3
-107,6 +107,7
{ERR_FUNC(RSA_F_RSA_PUBLIC_DECRYPT), "RSA_public_decryp
t"},
{ERR_FUNC(RSA_F_RSA_SETUP_BLINDING), "RSA_setup_blindin
g"},
{ERR_FUNC(RSA_F_RSA_SET_DEFAULT_METHOD), "RSA_set_defau
lt_method"},
+{ERR_FUNC(RSA_F_RSA_SET_METHOD), "RSA_set_method"
},
{ERR_FUNC(RSA_F_RSA_SIGN), "RSA_sign"},
{ERR_FUNC(RSA_F_RSA_SIGN_ASN1_OCTET_STRING), "RSA_sign_
ASN1_OCTET_STRING"},
{ERR_FUNC(RSA_F_RSA_VERIFY), "RSA_verify"},
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|
