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 15:33:33
Branch: OpenSSL-fips-0_9_8-stable Handle:
2007081414332706
Modified files: (Branch:
OpenSSL-fips-0_9_8-stable)
openssl/crypto fips_err.h
openssl/crypto/dsa dsa.h dsa_err.c
openssl/crypto/rand rand.h rand_err.c
openssl/crypto/rsa rsa.h rsa_err.c
openssl/fips-1.0 fips.c fips.h
Log:
Fix more error codes.
Summary:
Revision Changes Path
1.39.2.1.2.5+1 -0 openssl/crypto/dsa/dsa.h
1.13.2.2.2.3+1 -0 openssl/crypto/dsa/dsa_err.c
1.1.4.4 +11 -11 openssl/crypto/fips_err.h
1.32.4.2 +3 -0 openssl/crypto/rand/rand.h
1.7.2.1.2.2 +4 -1 openssl/crypto/rand/rand_err.c
1.55.2.7.2.6+2 -0 openssl/crypto/rsa/rsa.h
1.17.2.7.2.2+2 -0 openssl/crypto/rsa/rsa_err.c
1.1.4.8 +10 -0 openssl/fips-1.0/fips.c
1.1.4.8 +1 -0 openssl/fips-1.0/fips.h
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/crypto/dsa/dsa.h
============================================================
================
$ cvs diff -u -r1.39.2.1.2.4 -r1.39.2.1.2.5 dsa.h
--- openssl/crypto/dsa/dsa.h 13 Aug 2007 18:02:45
-0000 1.39.2.1.2.4
+++ openssl/crypto/dsa/dsa.h 14 Aug 2007 13:33:28
-0000 1.39.2.1.2.5
-292,6 +292,7
#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
.
patch -p0 <<' .'
Index: openssl/crypto/dsa/dsa_err.c
============================================================
================
$ cvs diff -u -r1.13.2.2.2.2 -r1.13.2.2.2.3 dsa_err.c
--- openssl/crypto/dsa/dsa_err.c 13 Aug 2007 18:02:46
-0000 1.13.2.2.2.2
+++ openssl/crypto/dsa/dsa_err.c 14 Aug 2007 13:33:28
-0000 1.13.2.2.2.3
-73,6 +73,7
{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_f
p"},
+{ERR_FUNC(DSA_F_DSA_BUILTIN_PARAMGEN), "DSA_BUILTIN_PA
RAMGEN"},
{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"},
.
patch -p0 <<' .'
Index: openssl/crypto/fips_err.h
============================================================
================
$ cvs diff -u -r1.1.4.3 -r1.1.4.4 fips_err.h
--- openssl/crypto/fips_err.h 6 Apr 2007 00:30:15
-0000 1.1.4.3
+++ openssl/crypto/fips_err.h 14 Aug 2007 13:33:27
-0000 1.1.4.4
-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_GE
NPARAMS"},
+{ERR_FUNC(FIPS_F_DSA_BUILTIN_PARAMGEN), "DSA_BUILTIN_P
ARAMGEN"},
{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_genera
te_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_SI
G"},
+{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_h
mac"},
{ERR_FUNC(FIPS_F_FIPS_SELFTEST_RNG), "FIPS_selftest_rng
"},
-{ERR_FUNC(FIPS_F_FIPS_SELFTEST_RSA), "FIPS_selftest_rs
a"},
-{ERR_FUNC(FIPS_F_FIPS_SELFTEST_SHA), "FIPS_SELFTEST_SH
A"},
+{ERR_FUNC(FIPS_F_FIPS_SELFTEST_SHA1), "FIPS_selftest_s
ha1"},
{ERR_FUNC(FIPS_F_HASH_FINAL), "HASH_FINAL"},
+{ERR_FUNC(FIPS_F_RSA_BUILTIN_KEYGEN), "RSA_BUILTIN_KEY
GEN"},
+{ERR_FUNC(FIPS_F_RSA_EAY_PRIVATE_DECRYPT), "RSA_EAY_PR
IVATE_DECRYPT"},
+{ERR_FUNC(FIPS_F_RSA_EAY_PRIVATE_ENCRYPT), "RSA_EAY_PR
IVATE_ENCRYPT"},
+{ERR_FUNC(FIPS_F_RSA_EAY_PUBLIC_DECRYPT), "RSA_EAY_PUB
LIC_DECRYPT"},
{ERR_FUNC(FIPS_F_RSA_EAY_PUBLIC_ENCRYPT), "RSA_EAY_PUBL
IC_ENCRYPT"},
-{ERR_FUNC(FIPS_F_RSA_GENERATE_KEY), "RSA_generate_key&
quot;},
-{ERR_FUNC(FIPS_F_RSA_X931_GENERATE_KEY), "RSA_X931_gen
erate_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}
};
.
patch -p0 <<' .'
Index: openssl/crypto/rand/rand.h
============================================================
================
$ cvs diff -u -r1.32.4.1 -r1.32.4.2 rand.h
--- openssl/crypto/rand/rand.h 22 Mar 2007 00:38:28
-0000 1.32.4.1
+++ openssl/crypto/rand/rand.h 14 Aug 2007 13:33:29
-0000 1.32.4.2
-139,7 +139,9
/* 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
#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
.
patch -p0 <<' .'
Index: openssl/crypto/rand/rand_err.c
============================================================
================
$ cvs diff -u -r1.7.2.1.2.1 -r1.7.2.1.2.2 rand_err.c
--- openssl/crypto/rand/rand_err.c 22 Mar 2007 00:38:28
-0000 1.7.2.1.2.1
+++ openssl/crypto/rand/rand_err.c 14 Aug 2007 13:33:29
-0000 1.7.2.1.2.2
-1,6 +1,6
/* 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
{
{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_SET_DT), "FIPS_RAND_SET_DT&
quot;},
{ERR_FUNC(RAND_F_FIPS_SET_DT), "FIPS_SET_DT"},
+{ERR_FUNC(RAND_F_FIPS_SET_PRNG_SEED), "FIPS_SET_PRNG_S
EED"},
{ERR_FUNC(RAND_F_FIPS_SET_TEST_MODE), "FIPS_SET_TEST_MO
DE"},
{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
{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}
};
.
patch -p0 <<' .'
Index: openssl/crypto/rsa/rsa.h
============================================================
================
$ cvs diff -u -r1.55.2.7.2.5 -r1.55.2.7.2.6 rsa.h
--- openssl/crypto/rsa/rsa.h 13 Aug 2007 18:02:49
-0000 1.55.2.7.2.5
+++ openssl/crypto/rsa/rsa.h 14 Aug 2007 13:33:32
-0000 1.55.2.7.2.6
-406,6 +406,8
/* Error codes for the RSA functions. */
/* Function codes. */
+#define RSA_F_FIPS_RSA_SIGN 140
+#define RSA_F_FIPS_RSA_VERIFY 141
#define RSA_F_MEMORY_LOCK 100
#define RSA_F_RSA_BUILTIN_KEYGEN 129
#define RSA_F_RSA_CHECK_KEY 123
.
patch -p0 <<' .'
Index: openssl/crypto/rsa/rsa_err.c
============================================================
================
$ cvs diff -u -r1.17.2.7.2.1 -r1.17.2.7.2.2 rsa_err.c
--- openssl/crypto/rsa/rsa_err.c 6 Apr 2007 00:30:18
-0000 1.17.2.7.2.1
+++ openssl/crypto/rsa/rsa_err.c 14 Aug 2007 13:33:32
-0000 1.17.2.7.2.2
-70,6 +70,8
static ERR_STRING_DATA RSA_str_functs[]=
{
+{ERR_FUNC(RSA_F_FIPS_RSA_SIGN), "FIPS_RSA_SIGN"},
+{ERR_FUNC(RSA_F_FIPS_RSA_VERIFY), "FIPS_RSA_VERIFY&quo
t;},
{ERR_FUNC(RSA_F_MEMORY_LOCK), "MEMORY_LOCK"},
{ERR_FUNC(RSA_F_RSA_BUILTIN_KEYGEN), "RSA_BUILTIN_KEYGE
N"},
{ERR_FUNC(RSA_F_RSA_CHECK_KEY), "RSA_check_key"},
.
patch -p0 <<' .'
Index: openssl/fips-1.0/fips.c
============================================================
================
$ cvs diff -u -r1.1.4.7 -r1.1.4.8 fips.c
--- openssl/fips-1.0/fips.c 14 Aug 2007 13:20:34
-0000 1.1.4.7
+++ openssl/fips-1.0/fips.c 14 Aug 2007 13:33:33
-0000 1.1.4.8
-490,5 +490,15
return 1;
}
+#if 0
+/* The purpose of this is to ensure the error code exists
and the function
+ * name is to keep the error checking script quiet
+ */
+void hash_final(void)
+ {
+ FIPSerr(FIPS_F_HASH_FINAL,FIPS_R_NON_FIPS_METHOD);
+ }
+#endif
+
#endif
.
patch -p0 <<' .'
Index: openssl/fips-1.0/fips.h
============================================================
================
$ cvs diff -u -r1.1.4.7 -r1.1.4.8 fips.h
--- openssl/fips-1.0/fips.h 14 Aug 2007 13:20:34
-0000 1.1.4.7
+++ openssl/fips-1.0/fips.h 14 Aug 2007 13:33:33
-0000 1.1.4.8
-119,6 +119,7
#define FIPS_F_FIPS_SELFTEST_HMAC 113
#define FIPS_F_FIPS_SELFTEST_RNG 114
#define FIPS_F_FIPS_SELFTEST_SHA1 115
+#define FIPS_F_HASH_FINAL 123
#define FIPS_F_RSA_BUILTIN_KEYGEN 116
#define FIPS_F_RSA_EAY_PRIVATE_DECRYPT 117
#define FIPS_F_RSA_EAY_PRIVATE_ENCRYPT 118
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|
