rpms/openssl/devel openssl-1.0.0-beta5-fips.patch, 1.1, 1.2 openssl.spec, 1.157, 1.158
Tomáš Mráz
tmraz at fedoraproject.org
Tue Feb 16 22:54:12 UTC 2010
- Previous message: rpms/hfsplus-tools/devel hfsplus-tools-332.14-add-needed.patch, NONE, 1.1 hfsplus-tools.spec, 1.11, 1.12
- Next message: rpms/device-mapper-multipath/devel 0012-RH-udev-sync-support.patch, NONE, 1.1 0023-RHBZ-557810-emc-invista-config.patch, NONE, 1.1 0024-RHBZ-565933-checker-timeout.patch, NONE, 1.1 0013-RH-add-weighted_prio-prioritizer.patch, 1.1, 1.2 0021-RHBZ-548874-add-find-multipaths.patch, 1.1, 1.2 0022-RHBZ-557845-RHEL5-style-partitions.patch, 1.1, 1.2 device-mapper-multipath.spec, 1.65, 1.66 0012-RH-explicitly-disable-dm-udev-sync-support-in-kpartx.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tmraz
Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24274
Modified Files:
openssl-1.0.0-beta5-fips.patch openssl.spec
Log Message:
* Tue Feb 16 2010 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.22.beta5
- make TLS work in the FIPS mode
openssl-1.0.0-beta5-fips.patch:
Configure | 14
Makefile.org | 6
crypto/Makefile | 6
crypto/bf/bf_skey.c | 7
crypto/bf/blowfish.h | 4
crypto/bn/Makefile | 4
crypto/bn/bn.h | 11
crypto/bn/bn_x931p.c | 272 ++++++++++
crypto/camellia/Makefile | 4
crypto/camellia/asm/cmll-x86.pl | 7
crypto/camellia/camellia.h | 5
crypto/camellia/cmll_fblk.c | 68 ++
crypto/camellia/cmll_misc.c | 9
crypto/cast/c_skey.c | 7
crypto/cast/cast.h | 4
crypto/crypto.h | 57 ++
crypto/dh/dh.h | 5
crypto/dh/dh_err.c | 3
crypto/dh/dh_gen.c | 18
crypto/dh/dh_key.c | 21
crypto/dsa/dsa.h | 23
crypto/dsa/dsa_gen.c | 19
crypto/dsa/dsa_key.c | 63 ++
crypto/dsa/dsa_ossl.c | 36 +
crypto/err/err_all.c | 6
crypto/evp/digest.c | 60 ++
crypto/evp/e_aes.c | 41 -
crypto/evp/e_camellia.c | 2
crypto/evp/e_des3.c | 24
crypto/evp/e_null.c | 2
crypto/evp/e_rc4.c | 1
crypto/evp/evp.h | 27 -
crypto/evp/evp_enc.c | 69 ++
crypto/evp/evp_err.c | 1
crypto/evp/evp_lib.c | 22
crypto/evp/evp_locl.h | 32 -
crypto/evp/m_dss.c | 2
crypto/evp/m_dss1.c | 2
crypto/evp/m_md2.c | 1
crypto/evp/m_md4.c | 1
crypto/evp/m_md5.c | 1
crypto/evp/m_mdc2.c | 1
crypto/evp/m_ripemd.c | 1
crypto/evp/m_sha1.c | 15
crypto/evp/m_wp.c | 1
crypto/evp/names.c | 8
crypto/evp/p_sign.c | 17
crypto/evp/p_verify.c | 17
crypto/fips/Makefile | 81 +++
crypto/fips/cavs/fips_aesavs.c | 939 +++++++++++++++++++++++++++++++++++++
crypto/fips/cavs/fips_desmovs.c | 702 +++++++++++++++++++++++++++
crypto/fips/cavs/fips_dssvs.c | 537 +++++++++++++++++++++
crypto/fips/cavs/fips_rngvs.c | 230 +++++++++
crypto/fips/cavs/fips_rsagtest.c | 390 +++++++++++++++
crypto/fips/cavs/fips_rsastest.c | 370 ++++++++++++++
crypto/fips/cavs/fips_rsavtest.c | 377 ++++++++++++++
crypto/fips/cavs/fips_shatest.c | 388 +++++++++++++++
crypto/fips/cavs/fips_utl.h | 343 +++++++++++++
crypto/fips/fips.c | 419 ++++++++++++++++
crypto/fips/fips.h | 163 ++++++
crypto/fips/fips_aes_selftest.c | 103 ++++
crypto/fips/fips_des_selftest.c | 139 +++++
crypto/fips/fips_dsa_selftest.c | 186 +++++++
crypto/fips/fips_hmac_selftest.c | 137 +++++
crypto/fips/fips_rand.c | 412 ++++++++++++++++
crypto/fips/fips_rand.h | 77 +++
crypto/fips/fips_rand_selftest.c | 373 ++++++++++++++
crypto/fips/fips_randtest.c | 248 +++++++++
crypto/fips/fips_rsa_selftest.c | 441 +++++++++++++++++
crypto/fips/fips_rsa_x931g.c | 281 +++++++++++
crypto/fips/fips_sha1_selftest.c | 99 +++
crypto/fips/fips_standalone_sha1.c | 173 ++++++
crypto/fips/fips_test_suite.c | 588 +++++++++++++++++++++++
crypto/fips_err.c | 7
crypto/fips_err.h | 137 +++++
crypto/fips_locl.h | 72 ++
crypto/hmac/hmac.c | 14
crypto/hmac/hmac.h | 1
crypto/md2/md2.h | 3
crypto/md2/md2_dgst.c | 7
crypto/md4/md4.h | 3
crypto/md4/md4_dgst.c | 7
crypto/md5/md5.h | 3
crypto/md5/md5_dgst.c | 7
crypto/mdc2/mdc2.h | 4
crypto/mdc2/mdc2dgst.c | 7
crypto/mem.c | 2
crypto/o_init.c | 80 +++
crypto/opensslconf.h.in | 15
crypto/pkcs12/p12_crt.c | 11
crypto/rand/md_rand.c | 12
crypto/rand/rand.h | 17
crypto/rand/rand_err.c | 17
crypto/rand/rand_lib.c | 17
crypto/rc2/rc2.h | 4
crypto/rc2/rc2_skey.c | 17
crypto/rc4/Makefile | 4
crypto/rc4/asm/rc4-586.pl | 8
crypto/rc4/asm/rc4-s390x.pl | 2
crypto/rc4/asm/rc4-x86_64.pl | 2
crypto/rc4/rc4.h | 3
crypto/rc4/rc4_fblk.c | 75 ++
crypto/rc4/rc4_skey.c | 14
crypto/ripemd/ripemd.h | 3
crypto/ripemd/rmd_dgst.c | 7
crypto/rsa/rsa.h | 28 +
crypto/rsa/rsa_eay.c | 160 ++++--
crypto/rsa/rsa_err.c | 6
crypto/rsa/rsa_gen.c | 104 ++++
crypto/rsa/rsa_lib.c | 40 +
crypto/rsa/rsa_sign.c | 10
crypto/seed/seed.c | 14
crypto/seed/seed.h | 3
crypto/sha/sha.h | 3
crypto/sha/sha1dgst.c | 4
crypto/sha/sha256.c | 10
crypto/sha/sha512.c | 10
crypto/sha/sha_dgst.c | 6
crypto/sha/sha_locl.h | 7
crypto/whrlpool/whrlpool.h | 3
crypto/whrlpool/wp_dgst.c | 5
ssl/s23_clnt.c | 16
ssl/s23_srvr.c | 9
ssl/s3_clnt.c | 6
ssl/s3_enc.c | 4
ssl/s3_srvr.c | 2
ssl/ssl_ciph.c | 7
ssl/ssl_lib.c | 8
ssl/ssltest.c | 35 +
ssl/t1_enc.c | 2
130 files changed, 10172 insertions(+), 135 deletions(-)
Index: openssl-1.0.0-beta5-fips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl-1.0.0-beta5-fips.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openssl-1.0.0-beta5-fips.patch 21 Jan 2010 08:12:12 -0000 1.1
+++ openssl-1.0.0-beta5-fips.patch 16 Feb 2010 22:54:12 -0000 1.2
@@ -1,6 +1,6 @@
diff -up openssl-1.0.0-beta5/Configure.fips openssl-1.0.0-beta5/Configure
---- openssl-1.0.0-beta5/Configure.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/Configure 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/Configure.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/Configure 2010-02-16 22:58:31.000000000 +0100
@@ -660,6 +660,7 @@ my $cmll_enc="camellia.o cmll_misc.o cml
my $processor="";
my $default_ranlib;
@@ -45,7 +45,7 @@ diff -up openssl-1.0.0-beta5/Configure.f
s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);
diff -up openssl-1.0.0-beta5/crypto/bf/bf_skey.c.fips openssl-1.0.0-beta5/crypto/bf/bf_skey.c
--- openssl-1.0.0-beta5/crypto/bf/bf_skey.c.fips 2008-11-12 04:57:52.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/bf/bf_skey.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/bf/bf_skey.c 2010-02-16 22:58:31.000000000 +0100
@@ -59,10 +59,15 @@
#include <stdio.h>
#include <string.h>
@@ -64,8 +64,8 @@ diff -up openssl-1.0.0-beta5/crypto/bf/b
int i;
BF_LONG *p,ri,in[2];
diff -up openssl-1.0.0-beta5/crypto/bf/blowfish.h.fips openssl-1.0.0-beta5/crypto/bf/blowfish.h
---- openssl-1.0.0-beta5/crypto/bf/blowfish.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/bf/blowfish.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/bf/blowfish.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/bf/blowfish.h 2010-02-16 22:58:31.000000000 +0100
@@ -104,7 +104,9 @@ typedef struct bf_key_st
BF_LONG S[4*256];
} BF_KEY;
@@ -78,8 +78,8 @@ diff -up openssl-1.0.0-beta5/crypto/bf/b
void BF_encrypt(BF_LONG *data,const BF_KEY *key);
diff -up openssl-1.0.0-beta5/crypto/bn/bn.h.fips openssl-1.0.0-beta5/crypto/bn/bn.h
---- openssl-1.0.0-beta5/crypto/bn/bn.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/bn/bn.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/bn/bn.h.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/bn/bn.h 2010-02-16 22:58:31.000000000 +0100
@@ -540,6 +540,17 @@ int BN_is_prime_ex(const BIGNUM *p,int n
int BN_is_prime_fasttest_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx,
int do_trial_division, BN_GENCB *cb);
@@ -99,8 +99,8 @@ diff -up openssl-1.0.0-beta5/crypto/bn/b
void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
int BN_mod_mul_montgomery(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,
diff -up openssl-1.0.0-beta5/crypto/bn/bn_x931p.c.fips openssl-1.0.0-beta5/crypto/bn/bn_x931p.c
---- openssl-1.0.0-beta5/crypto/bn/bn_x931p.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/bn/bn_x931p.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/bn/bn_x931p.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/bn/bn_x931p.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,272 @@
+/* bn_x931p.c */
+/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -376,7 +376,7 @@ diff -up openssl-1.0.0-beta5/crypto/bn/b
+
diff -up openssl-1.0.0-beta5/crypto/bn/Makefile.fips openssl-1.0.0-beta5/crypto/bn/Makefile
--- openssl-1.0.0-beta5/crypto/bn/Makefile.fips 2008-11-12 09:19:02.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/bn/Makefile 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/bn/Makefile 2010-02-16 22:58:31.000000000 +0100
@@ -26,13 +26,13 @@ LIBSRC= bn_add.c bn_div.c bn_exp.c bn_li
bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \
bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c \
@@ -395,7 +395,7 @@ diff -up openssl-1.0.0-beta5/crypto/bn/M
diff -up openssl-1.0.0-beta5/crypto/camellia/asm/cmll-x86.pl.fips openssl-1.0.0-beta5/crypto/camellia/asm/cmll-x86.pl
--- openssl-1.0.0-beta5/crypto/camellia/asm/cmll-x86.pl.fips 2009-04-06 16:25:02.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/camellia/asm/cmll-x86.pl 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/camellia/asm/cmll-x86.pl 2010-02-16 22:58:31.000000000 +0100
@@ -722,12 +722,15 @@ my $bias=int(@T[0])?shift(@T):0;
}
&function_end("Camellia_Ekeygen");
@@ -423,8 +423,8 @@ diff -up openssl-1.0.0-beta5/crypto/came
@SBOX=(
diff -up openssl-1.0.0-beta5/crypto/camellia/camellia.h.fips openssl-1.0.0-beta5/crypto/camellia/camellia.h
---- openssl-1.0.0-beta5/crypto/camellia/camellia.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/camellia/camellia.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/camellia/camellia.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/camellia/camellia.h 2010-02-16 22:58:31.000000000 +0100
@@ -88,6 +88,11 @@ struct camellia_key_st
};
typedef struct camellia_key_st CAMELLIA_KEY;
@@ -438,8 +438,8 @@ diff -up openssl-1.0.0-beta5/crypto/came
CAMELLIA_KEY *key);
diff -up openssl-1.0.0-beta5/crypto/camellia/cmll_fblk.c.fips openssl-1.0.0-beta5/crypto/camellia/cmll_fblk.c
---- openssl-1.0.0-beta5/crypto/camellia/cmll_fblk.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/camellia/cmll_fblk.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/camellia/cmll_fblk.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/camellia/cmll_fblk.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,68 @@
+/* crypto/camellia/camellia_misc.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
@@ -511,7 +511,7 @@ diff -up openssl-1.0.0-beta5/crypto/came
+#endif
diff -up openssl-1.0.0-beta5/crypto/camellia/cmll_misc.c.fips openssl-1.0.0-beta5/crypto/camellia/cmll_misc.c
--- openssl-1.0.0-beta5/crypto/camellia/cmll_misc.c.fips 2008-10-28 13:13:52.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/camellia/cmll_misc.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/camellia/cmll_misc.c 2010-02-16 22:58:31.000000000 +0100
@@ -52,11 +52,20 @@
#include <openssl/opensslv.h>
#include <openssl/camellia.h>
@@ -535,7 +535,7 @@ diff -up openssl-1.0.0-beta5/crypto/came
return -1;
diff -up openssl-1.0.0-beta5/crypto/camellia/Makefile.fips openssl-1.0.0-beta5/crypto/camellia/Makefile
--- openssl-1.0.0-beta5/crypto/camellia/Makefile.fips 2008-12-23 12:33:00.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/camellia/Makefile 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/camellia/Makefile 2010-02-16 22:58:31.000000000 +0100
@@ -23,9 +23,9 @@ APPS=
LIB=$(TOP)/libcrypto.a
@@ -549,8 +549,8 @@ diff -up openssl-1.0.0-beta5/crypto/came
SRC= $(LIBSRC)
diff -up openssl-1.0.0-beta5/crypto/cast/cast.h.fips openssl-1.0.0-beta5/crypto/cast/cast.h
---- openssl-1.0.0-beta5/crypto/cast/cast.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/cast/cast.h 2010-01-20 18:14:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/cast/cast.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/cast/cast.h 2010-02-16 22:58:31.000000000 +0100
@@ -83,7 +83,9 @@ typedef struct cast_key_st
int short_key; /* Use reduced rounds for short key */
} CAST_KEY;
@@ -564,7 +564,7 @@ diff -up openssl-1.0.0-beta5/crypto/cast
int enc);
diff -up openssl-1.0.0-beta5/crypto/cast/c_skey.c.fips openssl-1.0.0-beta5/crypto/cast/c_skey.c
--- openssl-1.0.0-beta5/crypto/cast/c_skey.c.fips 2000-06-03 16:13:35.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/cast/c_skey.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/cast/c_skey.c 2010-02-16 22:58:31.000000000 +0100
@@ -57,6 +57,11 @@
*/
@@ -587,8 +587,8 @@ diff -up openssl-1.0.0-beta5/crypto/cast
CAST_LONG x[16];
CAST_LONG z[16];
diff -up openssl-1.0.0-beta5/crypto/crypto.h.fips openssl-1.0.0-beta5/crypto/crypto.h
---- openssl-1.0.0-beta5/crypto/crypto.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/crypto.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/crypto.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/crypto.h 2010-02-16 22:58:31.000000000 +0100
@@ -546,12 +546,69 @@ void OpenSSLDie(const char *file,int lin
unsigned long *OPENSSL_ia32cap_loc(void);
#define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
@@ -661,7 +661,7 @@ diff -up openssl-1.0.0-beta5/crypto/cryp
/* Function codes. */
diff -up openssl-1.0.0-beta5/crypto/dh/dh_err.c.fips openssl-1.0.0-beta5/crypto/dh/dh_err.c
--- openssl-1.0.0-beta5/crypto/dh/dh_err.c.fips 2006-11-21 22:29:37.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/dh/dh_err.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/dh/dh_err.c 2010-02-16 22:58:31.000000000 +0100
@@ -73,6 +73,8 @@ static ERR_STRING_DATA DH_str_functs[]=
{ERR_FUNC(DH_F_COMPUTE_KEY), "COMPUTE_KEY"},
{ERR_FUNC(DH_F_DHPARAMS_PRINT_FP), "DHparams_print_fp"},
@@ -681,7 +681,7 @@ diff -up openssl-1.0.0-beta5/crypto/dh/d
{ERR_REASON(DH_R_NO_PARAMETERS_SET) ,"no parameters set"},
diff -up openssl-1.0.0-beta5/crypto/dh/dh_gen.c.fips openssl-1.0.0-beta5/crypto/dh/dh_gen.c
--- openssl-1.0.0-beta5/crypto/dh/dh_gen.c.fips 2005-04-26 20:53:15.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/dh/dh_gen.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/dh/dh_gen.c 2010-02-16 22:58:31.000000000 +0100
@@ -65,6 +65,10 @@
#include "cryptlib.h"
#include <openssl/bn.h>
@@ -715,8 +715,8 @@ diff -up openssl-1.0.0-beta5/crypto/dh/d
if (ctx == NULL) goto err;
BN_CTX_start(ctx);
diff -up openssl-1.0.0-beta5/crypto/dh/dh.h.fips openssl-1.0.0-beta5/crypto/dh/dh.h
---- openssl-1.0.0-beta5/crypto/dh/dh.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/dh/dh.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/dh/dh.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/dh/dh.h 2010-02-16 22:58:31.000000000 +0100
@@ -77,6 +77,8 @@
# define OPENSSL_DH_MAX_MODULUS_BITS 10000
#endif
@@ -745,7 +745,7 @@ diff -up openssl-1.0.0-beta5/crypto/dh/d
}
diff -up openssl-1.0.0-beta5/crypto/dh/dh_key.c.fips openssl-1.0.0-beta5/crypto/dh/dh_key.c
--- openssl-1.0.0-beta5/crypto/dh/dh_key.c.fips 2007-03-28 02:15:23.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/dh/dh_key.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/dh/dh_key.c 2010-02-16 22:58:31.000000000 +0100
@@ -61,6 +61,9 @@
#include <openssl/bn.h>
#include <openssl/rand.h>
@@ -797,7 +797,7 @@ diff -up openssl-1.0.0-beta5/crypto/dh/d
}
diff -up openssl-1.0.0-beta5/crypto/dsa/dsa_gen.c.fips openssl-1.0.0-beta5/crypto/dsa/dsa_gen.c
--- openssl-1.0.0-beta5/crypto/dsa/dsa_gen.c.fips 2008-12-26 18:17:21.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/dsa/dsa_gen.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/dsa/dsa_gen.c 2010-02-16 22:58:31.000000000 +0100
@@ -77,8 +77,12 @@
#include "cryptlib.h"
#include <openssl/evp.h>
@@ -834,8 +834,8 @@ diff -up openssl-1.0.0-beta5/crypto/dsa/
qsize != SHA256_DIGEST_LENGTH)
/* invalid q size */
diff -up openssl-1.0.0-beta5/crypto/dsa/dsa.h.fips openssl-1.0.0-beta5/crypto/dsa/dsa.h
---- openssl-1.0.0-beta5/crypto/dsa/dsa.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/dsa/dsa.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/dsa/dsa.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/dsa/dsa.h 2010-02-16 22:58:31.000000000 +0100
@@ -88,6 +88,8 @@
# define OPENSSL_DSA_MAX_MODULUS_BITS 10000
#endif
@@ -894,7 +894,7 @@ diff -up openssl-1.0.0-beta5/crypto/dsa/
#ifdef __cplusplus
diff -up openssl-1.0.0-beta5/crypto/dsa/dsa_key.c.fips openssl-1.0.0-beta5/crypto/dsa/dsa_key.c
--- openssl-1.0.0-beta5/crypto/dsa/dsa_key.c.fips 2007-03-28 02:15:25.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/dsa/dsa_key.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/dsa/dsa_key.c 2010-02-16 22:58:31.000000000 +0100
@@ -63,9 +63,55 @@
#include <openssl/bn.h>
#include <openssl/dsa.h>
@@ -984,7 +984,7 @@ diff -up openssl-1.0.0-beta5/crypto/dsa/
err:
diff -up openssl-1.0.0-beta5/crypto/dsa/dsa_ossl.c.fips openssl-1.0.0-beta5/crypto/dsa/dsa_ossl.c
--- openssl-1.0.0-beta5/crypto/dsa/dsa_ossl.c.fips 2007-03-28 02:15:26.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/dsa/dsa_ossl.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/dsa/dsa_ossl.c 2010-02-16 22:58:31.000000000 +0100
@@ -65,6 +65,9 @@
#include <openssl/dsa.h>
#include <openssl/rand.h>
@@ -1058,7 +1058,7 @@ diff -up openssl-1.0.0-beta5/crypto/dsa/
}
diff -up openssl-1.0.0-beta5/crypto/err/err_all.c.fips openssl-1.0.0-beta5/crypto/err/err_all.c
--- openssl-1.0.0-beta5/crypto/err/err_all.c.fips 2009-08-09 16:58:05.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/err/err_all.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/err/err_all.c 2010-02-16 22:58:31.000000000 +0100
@@ -96,6 +96,9 @@
#include <openssl/ocsp.h>
#include <openssl/err.h>
@@ -1081,7 +1081,7 @@ diff -up openssl-1.0.0-beta5/crypto/err/
#endif
diff -up openssl-1.0.0-beta5/crypto/evp/digest.c.fips openssl-1.0.0-beta5/crypto/evp/digest.c
--- openssl-1.0.0-beta5/crypto/evp/digest.c.fips 2009-12-09 16:02:14.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/evp/digest.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/digest.c 2010-02-16 22:58:31.000000000 +0100
@@ -116,6 +116,7 @@
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
@@ -1182,7 +1182,7 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
ret=ctx->digest->final(ctx,md);
diff -up openssl-1.0.0-beta5/crypto/evp/e_aes.c.fips openssl-1.0.0-beta5/crypto/evp/e_aes.c
--- openssl-1.0.0-beta5/crypto/evp/e_aes.c.fips 2004-01-28 20:05:33.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/evp/e_aes.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/e_aes.c 2010-02-16 22:58:31.000000000 +0100
@@ -69,32 +69,29 @@ typedef struct
IMPLEMENT_BLOCK_CIPHER(aes_128, ks, AES, EVP_AES_KEY,
@@ -1237,7 +1237,7 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
const unsigned char *iv, int enc)
diff -up openssl-1.0.0-beta5/crypto/evp/e_camellia.c.fips openssl-1.0.0-beta5/crypto/evp/e_camellia.c
--- openssl-1.0.0-beta5/crypto/evp/e_camellia.c.fips 2006-08-31 22:56:20.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/evp/e_camellia.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/e_camellia.c 2010-02-16 22:58:31.000000000 +0100
@@ -93,7 +93,7 @@ IMPLEMENT_BLOCK_CIPHER(camellia_256, ks,
EVP_CIPHER_get_asn1_iv,
NULL)
@@ -1249,7 +1249,7 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
IMPLEMENT_CAMELLIA_CFBR(192,1)
diff -up openssl-1.0.0-beta5/crypto/evp/e_des3.c.fips openssl-1.0.0-beta5/crypto/evp/e_des3.c
--- openssl-1.0.0-beta5/crypto/evp/e_des3.c.fips 2008-12-29 13:35:47.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/evp/e_des3.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/e_des3.c 2010-02-16 22:58:31.000000000 +0100
@@ -206,9 +206,9 @@ static int des_ede3_cfb8_cipher(EVP_CIPH
}
@@ -1296,7 +1296,7 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
diff -up openssl-1.0.0-beta5/crypto/evp/e_null.c.fips openssl-1.0.0-beta5/crypto/evp/e_null.c
--- openssl-1.0.0-beta5/crypto/evp/e_null.c.fips 2008-10-31 20:48:24.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/evp/e_null.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/e_null.c 2010-02-16 22:58:31.000000000 +0100
@@ -69,7 +69,7 @@ static const EVP_CIPHER n_cipher=
{
NID_undef,
@@ -1306,9 +1306,20 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
null_init_key,
null_cipher,
NULL,
+diff -up openssl-1.0.0-beta5/crypto/evp/e_rc4.c.fips openssl-1.0.0-beta5/crypto/evp/e_rc4.c
+--- openssl-1.0.0-beta5/crypto/evp/e_rc4.c.fips 2008-10-31 20:48:24.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/e_rc4.c 2010-02-16 23:47:04.000000000 +0100
+@@ -64,6 +64,7 @@
+ #include <openssl/evp.h>
+ #include <openssl/objects.h>
+ #include <openssl/rc4.h>
++#include "evp_locl.h"
+
+ /* FIXME: surely this is available elsewhere? */
+ #define EVP_RC4_KEY_SIZE 16
diff -up openssl-1.0.0-beta5/crypto/evp/evp_enc.c.fips openssl-1.0.0-beta5/crypto/evp/evp_enc.c
--- openssl-1.0.0-beta5/crypto/evp/evp_enc.c.fips 2008-11-12 04:58:00.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/evp/evp_enc.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/evp_enc.c 2010-02-16 22:58:31.000000000 +0100
@@ -68,8 +68,53 @@
const char EVP_version[]="EVP" OPENSSL_VERSION_PTEXT;
@@ -1403,7 +1414,7 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
}
diff -up openssl-1.0.0-beta5/crypto/evp/evp_err.c.fips openssl-1.0.0-beta5/crypto/evp/evp_err.c
--- openssl-1.0.0-beta5/crypto/evp/evp_err.c.fips 2009-12-17 16:28:44.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/evp/evp_err.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/evp_err.c 2010-02-16 22:58:31.000000000 +0100
@@ -154,6 +154,7 @@ static ERR_STRING_DATA EVP_str_reasons[]
{ERR_REASON(EVP_R_DECODE_ERROR) ,"decode error"},
{ERR_REASON(EVP_R_DIFFERENT_KEY_TYPES) ,"different key types"},
@@ -1413,8 +1424,8 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
{ERR_REASON(EVP_R_EVP_PBE_CIPHERINIT_ERROR),"evp pbe cipherinit error"},
{ERR_REASON(EVP_R_EXPECTING_AN_RSA_KEY) ,"expecting an rsa key"},
diff -up openssl-1.0.0-beta5/crypto/evp/evp.h.fips openssl-1.0.0-beta5/crypto/evp/evp.h
---- openssl-1.0.0-beta5/crypto/evp/evp.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/evp/evp.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/evp/evp.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/evp.h 2010-02-16 22:58:31.000000000 +0100
@@ -75,6 +75,10 @@
#include <openssl/bio.h>
#endif
@@ -1493,7 +1504,7 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
#define EVP_R_EXPECTING_AN_RSA_KEY 127
diff -up openssl-1.0.0-beta5/crypto/evp/evp_lib.c.fips openssl-1.0.0-beta5/crypto/evp/evp_lib.c
--- openssl-1.0.0-beta5/crypto/evp/evp_lib.c.fips 2009-12-25 15:12:24.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/evp/evp_lib.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/evp_lib.c 2010-02-16 22:58:31.000000000 +0100
@@ -67,6 +67,8 @@ int EVP_CIPHER_param_to_asn1(EVP_CIPHER_
if (c->cipher->set_asn1_parameters != NULL)
@@ -1542,8 +1553,8 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
+ return (ctx->flags & flags);
+ }
diff -up openssl-1.0.0-beta5/crypto/evp/evp_locl.h.fips openssl-1.0.0-beta5/crypto/evp/evp_locl.h
---- openssl-1.0.0-beta5/crypto/evp/evp_locl.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/evp/evp_locl.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/evp/evp_locl.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/evp_locl.h 2010-02-16 23:44:44.000000000 +0100
@@ -111,11 +111,11 @@ static int cname##_cbc_cipher(EVP_CIPHER
static int cname##_cfb##cbits##_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) \
{\
@@ -1558,7 +1569,7 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
inl-=chunk;\
in +=chunk;\
out+=chunk;\
-@@ -254,14 +254,29 @@ const EVP_CIPHER *EVP_##cname##_ecb(void
+@@ -254,14 +254,32 @@ const EVP_CIPHER *EVP_##cname##_ecb(void
#define EVP_C_DATA(kstruct, ctx) ((kstruct *)(ctx)->cipher_data)
@@ -1580,6 +1591,7 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
+#define CAST_set_key private_CAST_set_key
+#define RC5_32_set_key private_RC5_32_set_key
+#define BF_set_key private_BF_set_key
++#define SEED_set_key private_SEED_set_key
+#define Camellia_set_key private_Camellia_set_key
+#define idea_set_encrypt_key private_idea_set_encrypt_key
+
@@ -1588,6 +1600,8 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
+#define MD2_Init private_MD2_Init
+#define MDC2_Init private_MDC2_Init
+#define SHA_Init private_SHA_Init
++#define RIPEMD160_Init private_RIPEMD160_Init
++#define WHIRLPOOL_Init private_WHIRLPOOL_Init
+
+#endif
@@ -1595,7 +1609,7 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
{
diff -up openssl-1.0.0-beta5/crypto/evp/m_dss.c.fips openssl-1.0.0-beta5/crypto/evp/m_dss.c
--- openssl-1.0.0-beta5/crypto/evp/m_dss.c.fips 2006-04-19 19:05:57.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/evp/m_dss.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/m_dss.c 2010-02-16 22:58:31.000000000 +0100
@@ -81,7 +81,7 @@ static const EVP_MD dsa_md=
NID_dsaWithSHA,
NID_dsaWithSHA,
@@ -1607,7 +1621,7 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
final,
diff -up openssl-1.0.0-beta5/crypto/evp/m_dss1.c.fips openssl-1.0.0-beta5/crypto/evp/m_dss1.c
--- openssl-1.0.0-beta5/crypto/evp/m_dss1.c.fips 2006-04-19 19:05:57.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/evp/m_dss1.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/m_dss1.c 2010-02-16 22:58:31.000000000 +0100
@@ -82,7 +82,7 @@ static const EVP_MD dss1_md=
NID_dsa,
NID_dsaWithSHA1,
@@ -1617,9 +1631,64 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
init,
update,
final,
+diff -up openssl-1.0.0-beta5/crypto/evp/m_mdc2.c.fips openssl-1.0.0-beta5/crypto/evp/m_mdc2.c
+--- openssl-1.0.0-beta5/crypto/evp/m_mdc2.c.fips 2004-05-15 13:29:48.000000000 +0200
++++ openssl-1.0.0-beta5/crypto/evp/m_mdc2.c 2010-02-16 23:48:44.000000000 +0100
+@@ -66,6 +66,7 @@
+ #include <openssl/x509.h>
+ #include <openssl/mdc2.h>
+ #include <openssl/rsa.h>
++#include "evp_locl.h"
+
+ static int init(EVP_MD_CTX *ctx)
+ { return MDC2_Init(ctx->md_data); }
+diff -up openssl-1.0.0-beta5/crypto/evp/m_md2.c.fips openssl-1.0.0-beta5/crypto/evp/m_md2.c
+--- openssl-1.0.0-beta5/crypto/evp/m_md2.c.fips 2005-07-16 14:37:32.000000000 +0200
++++ openssl-1.0.0-beta5/crypto/evp/m_md2.c 2010-02-16 23:47:52.000000000 +0100
+@@ -68,6 +68,7 @@
+ #ifndef OPENSSL_NO_RSA
+ #include <openssl/rsa.h>
+ #endif
++#include "evp_locl.h"
+
+ static int init(EVP_MD_CTX *ctx)
+ { return MD2_Init(ctx->md_data); }
+diff -up openssl-1.0.0-beta5/crypto/evp/m_md4.c.fips openssl-1.0.0-beta5/crypto/evp/m_md4.c
+--- openssl-1.0.0-beta5/crypto/evp/m_md4.c.fips 2005-07-16 14:37:32.000000000 +0200
++++ openssl-1.0.0-beta5/crypto/evp/m_md4.c 2010-02-16 23:48:07.000000000 +0100
+@@ -68,6 +68,7 @@
+ #ifndef OPENSSL_NO_RSA
+ #include <openssl/rsa.h>
+ #endif
++#include "evp_locl.h"
+
+ static int init(EVP_MD_CTX *ctx)
+ { return MD4_Init(ctx->md_data); }
+diff -up openssl-1.0.0-beta5/crypto/evp/m_md5.c.fips openssl-1.0.0-beta5/crypto/evp/m_md5.c
+--- openssl-1.0.0-beta5/crypto/evp/m_md5.c.fips 2005-07-16 14:37:32.000000000 +0200
++++ openssl-1.0.0-beta5/crypto/evp/m_md5.c 2010-02-16 23:48:24.000000000 +0100
+@@ -68,6 +68,7 @@
+ #ifndef OPENSSL_NO_RSA
+ #include <openssl/rsa.h>
+ #endif
++#include "evp_locl.h"
+
+ static int init(EVP_MD_CTX *ctx)
+ { return MD5_Init(ctx->md_data); }
+diff -up openssl-1.0.0-beta5/crypto/evp/m_ripemd.c.fips openssl-1.0.0-beta5/crypto/evp/m_ripemd.c
+--- openssl-1.0.0-beta5/crypto/evp/m_ripemd.c.fips 2005-07-16 14:37:32.000000000 +0200
++++ openssl-1.0.0-beta5/crypto/evp/m_ripemd.c 2010-02-16 23:49:03.000000000 +0100
+@@ -68,6 +68,7 @@
+ #ifndef OPENSSL_NO_RSA
+ #include <openssl/rsa.h>
+ #endif
++#include "evp_locl.h"
+
+ static int init(EVP_MD_CTX *ctx)
+ { return RIPEMD160_Init(ctx->md_data); }
diff -up openssl-1.0.0-beta5/crypto/evp/m_sha1.c.fips openssl-1.0.0-beta5/crypto/evp/m_sha1.c
--- openssl-1.0.0-beta5/crypto/evp/m_sha1.c.fips 2008-03-12 22:14:24.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/evp/m_sha1.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/m_sha1.c 2010-02-16 22:58:31.000000000 +0100
@@ -82,7 +82,8 @@ static const EVP_MD sha1_md=
NID_sha1,
NID_sha1WithRSAEncryption,
@@ -1670,9 +1739,20 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
init512,
update512,
final512,
+diff -up openssl-1.0.0-beta5/crypto/evp/m_wp.c.fips openssl-1.0.0-beta5/crypto/evp/m_wp.c
+--- openssl-1.0.0-beta5/crypto/evp/m_wp.c.fips 2005-11-30 21:57:23.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/m_wp.c 2010-02-16 23:49:22.000000000 +0100
+@@ -9,6 +9,7 @@
+ #include <openssl/objects.h>
+ #include <openssl/x509.h>
+ #include <openssl/whrlpool.h>
++#include "evp_locl.h"
+
+ static int init(EVP_MD_CTX *ctx)
+ { return WHIRLPOOL_Init(ctx->md_data); }
diff -up openssl-1.0.0-beta5/crypto/evp/names.c.fips openssl-1.0.0-beta5/crypto/evp/names.c
--- openssl-1.0.0-beta5/crypto/evp/names.c.fips 2009-04-10 12:30:27.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/evp/names.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/names.c 2010-02-16 22:58:31.000000000 +0100
@@ -66,6 +66,10 @@ int EVP_add_cipher(const EVP_CIPHER *c)
{
int r;
@@ -1697,7 +1777,7 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
if (r == 0) return(0);
diff -up openssl-1.0.0-beta5/crypto/evp/p_sign.c.fips openssl-1.0.0-beta5/crypto/evp/p_sign.c
--- openssl-1.0.0-beta5/crypto/evp/p_sign.c.fips 2006-05-24 15:29:30.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/evp/p_sign.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/p_sign.c 2010-02-16 22:58:31.000000000 +0100
@@ -61,6 +61,7 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
@@ -1731,7 +1811,7 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
*siglen = sltmp;
diff -up openssl-1.0.0-beta5/crypto/evp/p_verify.c.fips openssl-1.0.0-beta5/crypto/evp/p_verify.c
--- openssl-1.0.0-beta5/crypto/evp/p_verify.c.fips 2008-11-12 04:58:01.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/evp/p_verify.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/evp/p_verify.c 2010-02-16 22:58:31.000000000 +0100
@@ -61,6 +61,7 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
@@ -1764,8 +1844,8 @@ diff -up openssl-1.0.0-beta5/crypto/evp/
err:
EVP_PKEY_CTX_free(pkctx);
diff -up openssl-1.0.0-beta5/crypto/fips/cavs/fips_aesavs.c.fips openssl-1.0.0-beta5/crypto/fips/cavs/fips_aesavs.c
---- openssl-1.0.0-beta5/crypto/fips/cavs/fips_aesavs.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_aesavs.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/cavs/fips_aesavs.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_aesavs.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,939 @@
+/* ====================================================================
+ * Copyright (c) 2004 The OpenSSL Project. All rights reserved.
@@ -2707,8 +2787,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/cavs/fips_desmovs.c.fips openssl-1.0.0-beta5/crypto/fips/cavs/fips_desmovs.c
---- openssl-1.0.0-beta5/crypto/fips/cavs/fips_desmovs.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_desmovs.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/cavs/fips_desmovs.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_desmovs.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,702 @@
+/* ====================================================================
+ * Copyright (c) 2004 The OpenSSL Project. All rights reserved.
@@ -3413,8 +3493,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/cavs/fips_dssvs.c.fips openssl-1.0.0-beta5/crypto/fips/cavs/fips_dssvs.c
---- openssl-1.0.0-beta5/crypto/fips/cavs/fips_dssvs.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_dssvs.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/cavs/fips_dssvs.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_dssvs.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,537 @@
+#include <openssl/opensslconf.h>
+
@@ -3954,8 +4034,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/cavs/fips_rngvs.c.fips openssl-1.0.0-beta5/crypto/fips/cavs/fips_rngvs.c
---- openssl-1.0.0-beta5/crypto/fips/cavs/fips_rngvs.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_rngvs.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/cavs/fips_rngvs.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_rngvs.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,230 @@
+/*
+ * Crude test driver for processing the VST and MCT testvector files
@@ -4188,8 +4268,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+ }
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsagtest.c.fips openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsagtest.c
---- openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsagtest.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsagtest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsagtest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsagtest.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,390 @@
+/* fips_rsagtest.c */
+/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -4582,8 +4662,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsastest.c.fips openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsastest.c
---- openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsastest.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsastest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsastest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsastest.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,370 @@
+/* fips_rsastest.c */
+/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -4956,8 +5036,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+ }
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsavtest.c.fips openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsavtest.c
---- openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsavtest.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsavtest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsavtest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_rsavtest.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,377 @@
+/* fips_rsavtest.c */
+/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -5337,8 +5417,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+ }
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/cavs/fips_shatest.c.fips openssl-1.0.0-beta5/crypto/fips/cavs/fips_shatest.c
---- openssl-1.0.0-beta5/crypto/fips/cavs/fips_shatest.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_shatest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/cavs/fips_shatest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_shatest.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,388 @@
+/* fips_shatest.c */
+/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -5729,8 +5809,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/cavs/fips_utl.h.fips openssl-1.0.0-beta5/crypto/fips/cavs/fips_utl.h
---- openssl-1.0.0-beta5/crypto/fips/cavs/fips_utl.h.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_utl.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/cavs/fips_utl.h.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/cavs/fips_utl.h 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,343 @@
+/* ====================================================================
+ * Copyright (c) 2007 The OpenSSL Project. All rights reserved.
@@ -6076,8 +6156,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+ }
+
diff -up openssl-1.0.0-beta5/crypto/fips_err.c.fips openssl-1.0.0-beta5/crypto/fips_err.c
---- openssl-1.0.0-beta5/crypto/fips_err.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips_err.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips_err.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips_err.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,7 @@
+#include <openssl/opensslconf.h>
+
@@ -6087,8 +6167,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+static void *dummy=&dummy;
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips_err.h.fips openssl-1.0.0-beta5/crypto/fips_err.h
---- openssl-1.0.0-beta5/crypto/fips_err.h.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips_err.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips_err.h.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips_err.h 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,137 @@
+/* crypto/fips_err.h */
+/* ====================================================================
@@ -6228,8 +6308,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+#endif
+ }
diff -up openssl-1.0.0-beta5/crypto/fips/fips_aes_selftest.c.fips openssl-1.0.0-beta5/crypto/fips/fips_aes_selftest.c
---- openssl-1.0.0-beta5/crypto/fips/fips_aes_selftest.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_aes_selftest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_aes_selftest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_aes_selftest.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,103 @@
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project. All rights reserved.
@@ -6335,8 +6415,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+ }
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/fips.c.fips openssl-1.0.0-beta5/crypto/fips/fips.c
---- openssl-1.0.0-beta5/crypto/fips/fips.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,419 @@
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project. All rights reserved.
@@ -6758,8 +6838,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/fips_des_selftest.c.fips openssl-1.0.0-beta5/crypto/fips/fips_des_selftest.c
---- openssl-1.0.0-beta5/crypto/fips/fips_des_selftest.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_des_selftest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_des_selftest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_des_selftest.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,139 @@
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project. All rights reserved.
@@ -6901,8 +6981,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+ }
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/fips_dsa_selftest.c.fips openssl-1.0.0-beta5/crypto/fips/fips_dsa_selftest.c
---- openssl-1.0.0-beta5/crypto/fips/fips_dsa_selftest.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_dsa_selftest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_dsa_selftest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_dsa_selftest.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,186 @@
+/* crypto/dsa/dsatest.c */
+/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
@@ -7091,8 +7171,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+ }
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/fips.h.fips openssl-1.0.0-beta5/crypto/fips/fips.h
---- openssl-1.0.0-beta5/crypto/fips/fips.h.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips.h.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips.h 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,163 @@
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project. All rights reserved.
@@ -7258,8 +7338,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+#endif
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/fips_hmac_selftest.c.fips openssl-1.0.0-beta5/crypto/fips/fips_hmac_selftest.c
---- openssl-1.0.0-beta5/crypto/fips/fips_hmac_selftest.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_hmac_selftest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_hmac_selftest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_hmac_selftest.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,137 @@
+/* ====================================================================
+ * Copyright (c) 2005 The OpenSSL Project. All rights reserved.
@@ -7399,8 +7479,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+ }
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/fips_rand.c.fips openssl-1.0.0-beta5/crypto/fips/fips_rand.c
---- openssl-1.0.0-beta5/crypto/fips/fips_rand.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_rand.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_rand.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_rand.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,412 @@
+/* ====================================================================
+ * Copyright (c) 2007 The OpenSSL Project. All rights reserved.
@@ -7815,8 +7895,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/fips_rand.h.fips openssl-1.0.0-beta5/crypto/fips/fips_rand.h
---- openssl-1.0.0-beta5/crypto/fips/fips_rand.h.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_rand.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_rand.h.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_rand.h 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,77 @@
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project. All rights reserved.
@@ -7896,8 +7976,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+#endif
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/fips_rand_selftest.c.fips openssl-1.0.0-beta5/crypto/fips/fips_rand_selftest.c
---- openssl-1.0.0-beta5/crypto/fips/fips_rand_selftest.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_rand_selftest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_rand_selftest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_rand_selftest.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,373 @@
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project. All rights reserved.
@@ -8273,8 +8353,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/fips_randtest.c.fips openssl-1.0.0-beta5/crypto/fips/fips_randtest.c
---- openssl-1.0.0-beta5/crypto/fips/fips_randtest.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_randtest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_randtest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_randtest.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,248 @@
+/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
+ * All rights reserved.
@@ -8525,8 +8605,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/fips_rsa_selftest.c.fips openssl-1.0.0-beta5/crypto/fips/fips_rsa_selftest.c
---- openssl-1.0.0-beta5/crypto/fips/fips_rsa_selftest.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_rsa_selftest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_rsa_selftest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_rsa_selftest.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,441 @@
+/* ====================================================================
+ * Copyright (c) 2003-2007 The OpenSSL Project. All rights reserved.
@@ -8970,8 +9050,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+#endif /* def OPENSSL_FIPS */
diff -up openssl-1.0.0-beta5/crypto/fips/fips_rsa_x931g.c.fips openssl-1.0.0-beta5/crypto/fips/fips_rsa_x931g.c
---- openssl-1.0.0-beta5/crypto/fips/fips_rsa_x931g.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_rsa_x931g.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_rsa_x931g.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_rsa_x931g.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,281 @@
+/* crypto/rsa/rsa_gen.c */
+/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
@@ -9255,8 +9335,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+ }
diff -up openssl-1.0.0-beta5/crypto/fips/fips_sha1_selftest.c.fips openssl-1.0.0-beta5/crypto/fips/fips_sha1_selftest.c
---- openssl-1.0.0-beta5/crypto/fips/fips_sha1_selftest.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_sha1_selftest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_sha1_selftest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_sha1_selftest.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,99 @@
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project. All rights reserved.
@@ -9358,8 +9438,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/fips_standalone_sha1.c.fips openssl-1.0.0-beta5/crypto/fips/fips_standalone_sha1.c
---- openssl-1.0.0-beta5/crypto/fips/fips_standalone_sha1.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_standalone_sha1.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_standalone_sha1.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_standalone_sha1.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,173 @@
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project. All rights reserved.
@@ -9535,8 +9615,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+
diff -up openssl-1.0.0-beta5/crypto/fips/fips_test_suite.c.fips openssl-1.0.0-beta5/crypto/fips/fips_test_suite.c
---- openssl-1.0.0-beta5/crypto/fips/fips_test_suite.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/fips_test_suite.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/fips_test_suite.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/fips_test_suite.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,588 @@
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project. All rights reserved.
@@ -10127,8 +10207,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips_locl.h.fips openssl-1.0.0-beta5/crypto/fips_locl.h
---- openssl-1.0.0-beta5/crypto/fips_locl.h.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips_locl.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips_locl.h.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips_locl.h 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,72 @@
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project. All rights reserved.
@@ -10203,8 +10283,8 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+#endif
+#endif
diff -up openssl-1.0.0-beta5/crypto/fips/Makefile.fips openssl-1.0.0-beta5/crypto/fips/Makefile
---- openssl-1.0.0-beta5/crypto/fips/Makefile.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/fips/Makefile 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/fips/Makefile.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/fips/Makefile 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,81 @@
+#
+# OpenSSL/crypto/fips/Makefile
@@ -10289,7 +10369,7 @@ diff -up openssl-1.0.0-beta5/crypto/fips
+
diff -up openssl-1.0.0-beta5/crypto/hmac/hmac.c.fips openssl-1.0.0-beta5/crypto/hmac/hmac.c
--- openssl-1.0.0-beta5/crypto/hmac/hmac.c.fips 2008-11-12 04:58:02.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/hmac/hmac.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/hmac/hmac.c 2010-02-16 22:58:31.000000000 +0100
@@ -77,6 +77,13 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const vo
if (key != NULL)
@@ -10316,8 +10396,8 @@ diff -up openssl-1.0.0-beta5/crypto/hmac
+ }
+
diff -up openssl-1.0.0-beta5/crypto/hmac/hmac.h.fips openssl-1.0.0-beta5/crypto/hmac/hmac.h
---- openssl-1.0.0-beta5/crypto/hmac/hmac.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/hmac/hmac.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/hmac/hmac.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/hmac/hmac.h 2010-02-16 22:58:31.000000000 +0100
@@ -101,6 +101,7 @@ unsigned char *HMAC(const EVP_MD *evp_md
unsigned int *md_len);
int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
@@ -10328,7 +10408,7 @@ diff -up openssl-1.0.0-beta5/crypto/hmac
}
diff -up openssl-1.0.0-beta5/crypto/Makefile.fips openssl-1.0.0-beta5/crypto/Makefile
--- openssl-1.0.0-beta5/crypto/Makefile.fips 2009-04-06 16:31:35.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/Makefile 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/Makefile 2010-02-16 22:58:31.000000000 +0100
@@ -34,14 +34,14 @@ GENERAL=Makefile README crypto-lib.com i
LIB= $(TOP)/libcrypto.a
@@ -10349,7 +10429,7 @@ diff -up openssl-1.0.0-beta5/crypto/Make
diff -up openssl-1.0.0-beta5/crypto/mdc2/mdc2dgst.c.fips openssl-1.0.0-beta5/crypto/mdc2/mdc2dgst.c
--- openssl-1.0.0-beta5/crypto/mdc2/mdc2dgst.c.fips 2004-07-25 21:10:41.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/mdc2/mdc2dgst.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/mdc2/mdc2dgst.c 2010-02-16 22:58:31.000000000 +0100
@@ -61,6 +61,11 @@
#include <string.h>
#include <openssl/des.h>
@@ -10372,8 +10452,8 @@ diff -up openssl-1.0.0-beta5/crypto/mdc2
c->num=0;
c->pad_type=1;
diff -up openssl-1.0.0-beta5/crypto/mdc2/mdc2.h.fips openssl-1.0.0-beta5/crypto/mdc2/mdc2.h
---- openssl-1.0.0-beta5/crypto/mdc2/mdc2.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/mdc2/mdc2.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/mdc2/mdc2.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/mdc2/mdc2.h 2010-02-16 22:58:31.000000000 +0100
@@ -80,7 +80,9 @@ typedef struct mdc2_ctx_st
int pad_type; /* either 1 or 2, default 1 */
} MDC2_CTX;
@@ -10387,7 +10467,7 @@ diff -up openssl-1.0.0-beta5/crypto/mdc2
int MDC2_Final(unsigned char *md, MDC2_CTX *c);
diff -up openssl-1.0.0-beta5/crypto/md2/md2_dgst.c.fips openssl-1.0.0-beta5/crypto/md2/md2_dgst.c
--- openssl-1.0.0-beta5/crypto/md2/md2_dgst.c.fips 2007-08-31 12:12:35.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/md2/md2_dgst.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/md2/md2_dgst.c 2010-02-16 22:58:31.000000000 +0100
@@ -62,6 +62,11 @@
#include <openssl/md2.h>
#include <openssl/opensslv.h>
@@ -10410,8 +10490,8 @@ diff -up openssl-1.0.0-beta5/crypto/md2/
c->num=0;
memset(c->state,0,sizeof c->state);
diff -up openssl-1.0.0-beta5/crypto/md2/md2.h.fips openssl-1.0.0-beta5/crypto/md2/md2.h
---- openssl-1.0.0-beta5/crypto/md2/md2.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/md2/md2.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/md2/md2.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/md2/md2.h 2010-02-16 22:58:31.000000000 +0100
@@ -81,6 +81,9 @@ typedef struct MD2state_st
} MD2_CTX;
@@ -10424,7 +10504,7 @@ diff -up openssl-1.0.0-beta5/crypto/md2/
int MD2_Final(unsigned char *md, MD2_CTX *c);
diff -up openssl-1.0.0-beta5/crypto/md4/md4_dgst.c.fips openssl-1.0.0-beta5/crypto/md4/md4_dgst.c
--- openssl-1.0.0-beta5/crypto/md4/md4_dgst.c.fips 2007-01-21 14:07:11.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/md4/md4_dgst.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/md4/md4_dgst.c 2010-02-16 22:58:31.000000000 +0100
@@ -59,6 +59,11 @@
#include <stdio.h>
#include "md4_locl.h"
@@ -10447,8 +10527,8 @@ diff -up openssl-1.0.0-beta5/crypto/md4/
memset (c,0,sizeof(*c));
c->A=INIT_DATA_A;
diff -up openssl-1.0.0-beta5/crypto/md4/md4.h.fips openssl-1.0.0-beta5/crypto/md4/md4.h
---- openssl-1.0.0-beta5/crypto/md4/md4.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/md4/md4.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/md4/md4.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/md4/md4.h 2010-02-16 22:58:31.000000000 +0100
@@ -105,6 +105,9 @@ typedef struct MD4state_st
unsigned int num;
} MD4_CTX;
@@ -10461,7 +10541,7 @@ diff -up openssl-1.0.0-beta5/crypto/md4/
int MD4_Final(unsigned char *md, MD4_CTX *c);
diff -up openssl-1.0.0-beta5/crypto/md5/md5_dgst.c.fips openssl-1.0.0-beta5/crypto/md5/md5_dgst.c
--- openssl-1.0.0-beta5/crypto/md5/md5_dgst.c.fips 2007-01-21 14:07:11.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/md5/md5_dgst.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/md5/md5_dgst.c 2010-02-16 22:58:31.000000000 +0100
@@ -59,6 +59,11 @@
#include <stdio.h>
#include "md5_locl.h"
@@ -10484,8 +10564,8 @@ diff -up openssl-1.0.0-beta5/crypto/md5/
memset (c,0,sizeof(*c));
c->A=INIT_DATA_A;
diff -up openssl-1.0.0-beta5/crypto/md5/md5.h.fips openssl-1.0.0-beta5/crypto/md5/md5.h
---- openssl-1.0.0-beta5/crypto/md5/md5.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/md5/md5.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/md5/md5.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/md5/md5.h 2010-02-16 22:58:31.000000000 +0100
@@ -105,6 +105,9 @@ typedef struct MD5state_st
unsigned int num;
} MD5_CTX;
@@ -10498,7 +10578,7 @@ diff -up openssl-1.0.0-beta5/crypto/md5/
int MD5_Final(unsigned char *md, MD5_CTX *c);
diff -up openssl-1.0.0-beta5/crypto/mem.c.fips openssl-1.0.0-beta5/crypto/mem.c
--- openssl-1.0.0-beta5/crypto/mem.c.fips 2008-11-12 04:57:47.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/mem.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/mem.c 2010-02-16 22:58:31.000000000 +0100
@@ -101,7 +101,7 @@ static void (*free_locked_func)(void *)
/* may be changed as long as 'allow_customize_debug' is set */
@@ -10509,8 +10589,8 @@ diff -up openssl-1.0.0-beta5/crypto/mem.
static void (*malloc_debug_func)(void *,int,const char *,int,int)
= CRYPTO_dbg_malloc;
diff -up openssl-1.0.0-beta5/crypto/o_init.c.fips openssl-1.0.0-beta5/crypto/o_init.c
---- openssl-1.0.0-beta5/crypto/o_init.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/o_init.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/o_init.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/o_init.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,80 @@
+/* o_init.c */
+/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -10594,7 +10674,7 @@ diff -up openssl-1.0.0-beta5/crypto/o_in
+
diff -up openssl-1.0.0-beta5/crypto/opensslconf.h.in.fips openssl-1.0.0-beta5/crypto/opensslconf.h.in
--- openssl-1.0.0-beta5/crypto/opensslconf.h.in.fips 2005-12-16 11:37:23.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/opensslconf.h.in 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/opensslconf.h.in 2010-02-16 22:58:31.000000000 +0100
@@ -1,5 +1,20 @@
/* crypto/opensslconf.h.in */
@@ -10618,7 +10698,7 @@ diff -up openssl-1.0.0-beta5/crypto/open
diff -up openssl-1.0.0-beta5/crypto/pkcs12/p12_crt.c.fips openssl-1.0.0-beta5/crypto/pkcs12/p12_crt.c
--- openssl-1.0.0-beta5/crypto/pkcs12/p12_crt.c.fips 2009-03-09 14:08:04.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/pkcs12/p12_crt.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/pkcs12/p12_crt.c 2010-02-16 22:58:31.000000000 +0100
@@ -59,6 +59,10 @@
#include <stdio.h>
#include "cryptlib.h"
@@ -10647,7 +10727,7 @@ diff -up openssl-1.0.0-beta5/crypto/pkcs
if (!iter)
diff -up openssl-1.0.0-beta5/crypto/rand/md_rand.c.fips openssl-1.0.0-beta5/crypto/rand/md_rand.c
--- openssl-1.0.0-beta5/crypto/rand/md_rand.c.fips 2009-01-03 10:25:32.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rand/md_rand.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rand/md_rand.c 2010-02-16 22:58:31.000000000 +0100
@@ -126,6 +126,10 @@
#include <openssl/crypto.h>
@@ -10676,7 +10756,7 @@ diff -up openssl-1.0.0-beta5/crypto/rand
{
diff -up openssl-1.0.0-beta5/crypto/rand/rand_err.c.fips openssl-1.0.0-beta5/crypto/rand/rand_err.c
--- openssl-1.0.0-beta5/crypto/rand/rand_err.c.fips 2006-11-21 22:29:41.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rand/rand_err.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rand/rand_err.c 2010-02-16 22:58:31.000000000 +0100
@@ -70,6 +70,13 @@
static ERR_STRING_DATA RAND_str_functs[]=
@@ -10710,8 +10790,8 @@ diff -up openssl-1.0.0-beta5/crypto/rand
};
diff -up openssl-1.0.0-beta5/crypto/rand/rand.h.fips openssl-1.0.0-beta5/crypto/rand/rand.h
---- openssl-1.0.0-beta5/crypto/rand/rand.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rand/rand.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/rand/rand.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rand/rand.h 2010-02-16 22:58:31.000000000 +0100
@@ -128,11 +128,28 @@ void ERR_load_RAND_strings(void);
/* Error codes for the RAND functions. */
@@ -10743,7 +10823,7 @@ diff -up openssl-1.0.0-beta5/crypto/rand
}
diff -up openssl-1.0.0-beta5/crypto/rand/rand_lib.c.fips openssl-1.0.0-beta5/crypto/rand/rand_lib.c
--- openssl-1.0.0-beta5/crypto/rand/rand_lib.c.fips 2008-11-12 04:58:04.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rand/rand_lib.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rand/rand_lib.c 2010-02-16 22:58:31.000000000 +0100
@@ -60,6 +60,12 @@
#include <time.h>
#include "cryptlib.h"
@@ -10778,8 +10858,8 @@ diff -up openssl-1.0.0-beta5/crypto/rand
}
diff -up openssl-1.0.0-beta5/crypto/rc2/rc2.h.fips openssl-1.0.0-beta5/crypto/rc2/rc2.h
---- openssl-1.0.0-beta5/crypto/rc2/rc2.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rc2/rc2.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/rc2/rc2.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rc2/rc2.h 2010-02-16 22:58:31.000000000 +0100
@@ -79,7 +79,9 @@ typedef struct rc2_key_st
RC2_INT data[64];
} RC2_KEY;
@@ -10793,7 +10873,7 @@ diff -up openssl-1.0.0-beta5/crypto/rc2/
int enc);
diff -up openssl-1.0.0-beta5/crypto/rc2/rc2_skey.c.fips openssl-1.0.0-beta5/crypto/rc2/rc2_skey.c
--- openssl-1.0.0-beta5/crypto/rc2/rc2_skey.c.fips 2007-09-18 23:10:32.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/rc2/rc2_skey.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rc2/rc2_skey.c 2010-02-16 22:58:31.000000000 +0100
@@ -57,6 +57,11 @@
*/
@@ -10829,7 +10909,7 @@ diff -up openssl-1.0.0-beta5/crypto/rc2/
RC2_INT *ki;
diff -up openssl-1.0.0-beta5/crypto/rc4/asm/rc4-s390x.pl.fips openssl-1.0.0-beta5/crypto/rc4/asm/rc4-s390x.pl
--- openssl-1.0.0-beta5/crypto/rc4/asm/rc4-s390x.pl.fips 2009-02-12 15:48:49.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rc4/asm/rc4-s390x.pl 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rc4/asm/rc4-s390x.pl 2010-02-16 22:58:31.000000000 +0100
@@ -202,4 +202,6 @@ RC4_options:
.string "rc4(8x,char)"
___
@@ -10839,7 +10919,7 @@ diff -up openssl-1.0.0-beta5/crypto/rc4/
print $code;
diff -up openssl-1.0.0-beta5/crypto/rc4/asm/rc4-x86_64.pl.fips openssl-1.0.0-beta5/crypto/rc4/asm/rc4-x86_64.pl
--- openssl-1.0.0-beta5/crypto/rc4/asm/rc4-x86_64.pl.fips 2009-04-27 21:31:04.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/rc4/asm/rc4-x86_64.pl 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rc4/asm/rc4-x86_64.pl 2010-02-16 22:58:31.000000000 +0100
@@ -499,6 +499,8 @@ ___
$code =~ s/#([bwd])/$1/gm;
@@ -10851,7 +10931,7 @@ diff -up openssl-1.0.0-beta5/crypto/rc4/
close STDOUT;
diff -up openssl-1.0.0-beta5/crypto/rc4/asm/rc4-586.pl.fips openssl-1.0.0-beta5/crypto/rc4/asm/rc4-586.pl
--- openssl-1.0.0-beta5/crypto/rc4/asm/rc4-586.pl.fips 2007-12-02 22:32:03.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rc4/asm/rc4-586.pl 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rc4/asm/rc4-586.pl 2010-02-16 22:58:31.000000000 +0100
@@ -166,8 +166,12 @@ $idx="edx";
&external_label("OPENSSL_ia32cap_P");
@@ -10877,7 +10957,7 @@ diff -up openssl-1.0.0-beta5/crypto/rc4/
&function_begin_B("RC4_options");
diff -up openssl-1.0.0-beta5/crypto/rc4/Makefile.fips openssl-1.0.0-beta5/crypto/rc4/Makefile
--- openssl-1.0.0-beta5/crypto/rc4/Makefile.fips 2009-02-11 11:01:36.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rc4/Makefile 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rc4/Makefile 2010-02-16 22:58:31.000000000 +0100
@@ -21,8 +21,8 @@ TEST=rc4test.c
APPS=
@@ -10890,8 +10970,8 @@ diff -up openssl-1.0.0-beta5/crypto/rc4/
SRC= $(LIBSRC)
diff -up openssl-1.0.0-beta5/crypto/rc4/rc4_fblk.c.fips openssl-1.0.0-beta5/crypto/rc4/rc4_fblk.c
---- openssl-1.0.0-beta5/crypto/rc4/rc4_fblk.c.fips 2010-01-20 18:13:46.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rc4/rc4_fblk.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/rc4/rc4_fblk.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rc4/rc4_fblk.c 2010-02-16 22:58:31.000000000 +0100
@@ -0,0 +1,75 @@
+/* crypto/rc4/rc4_fblk.c */
+/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
@@ -10969,8 +11049,8 @@ diff -up openssl-1.0.0-beta5/crypto/rc4/
+#endif
+
diff -up openssl-1.0.0-beta5/crypto/rc4/rc4.h.fips openssl-1.0.0-beta5/crypto/rc4/rc4.h
---- openssl-1.0.0-beta5/crypto/rc4/rc4.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rc4/rc4.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/rc4/rc4.h.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rc4/rc4.h 2010-02-16 22:58:31.000000000 +0100
@@ -78,6 +78,9 @@ typedef struct rc4_key_st
@@ -10983,7 +11063,7 @@ diff -up openssl-1.0.0-beta5/crypto/rc4/
unsigned char *outdata);
diff -up openssl-1.0.0-beta5/crypto/rc4/rc4_skey.c.fips openssl-1.0.0-beta5/crypto/rc4/rc4_skey.c
--- openssl-1.0.0-beta5/crypto/rc4/rc4_skey.c.fips 2007-01-21 14:07:13.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rc4/rc4_skey.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rc4/rc4_skey.c 2010-02-16 22:58:31.000000000 +0100
@@ -59,6 +59,11 @@
#include <openssl/rc4.h>
#include "rc4_locl.h"
@@ -11022,8 +11102,8 @@ diff -up openssl-1.0.0-beta5/crypto/rc4/
for (i=0;i<256;i++) cp[i]=i;
diff -up openssl-1.0.0-beta5/crypto/ripemd/ripemd.h.fips openssl-1.0.0-beta5/crypto/ripemd/ripemd.h
---- openssl-1.0.0-beta5/crypto/ripemd/ripemd.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/ripemd/ripemd.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/ripemd/ripemd.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/ripemd/ripemd.h 2010-02-16 22:58:31.000000000 +0100
@@ -91,6 +91,9 @@ typedef struct RIPEMD160state_st
unsigned int num;
} RIPEMD160_CTX;
@@ -11036,7 +11116,7 @@ diff -up openssl-1.0.0-beta5/crypto/ripe
int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
diff -up openssl-1.0.0-beta5/crypto/ripemd/rmd_dgst.c.fips openssl-1.0.0-beta5/crypto/ripemd/rmd_dgst.c
--- openssl-1.0.0-beta5/crypto/ripemd/rmd_dgst.c.fips 2007-01-21 14:07:13.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/ripemd/rmd_dgst.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/ripemd/rmd_dgst.c 2010-02-16 22:58:31.000000000 +0100
@@ -59,6 +59,11 @@
#include <stdio.h>
#include "rmd_locl.h"
@@ -11060,7 +11140,7 @@ diff -up openssl-1.0.0-beta5/crypto/ripe
c->A=RIPEMD160_A;
diff -up openssl-1.0.0-beta5/crypto/rsa/rsa_eay.c.fips openssl-1.0.0-beta5/crypto/rsa/rsa_eay.c
--- openssl-1.0.0-beta5/crypto/rsa/rsa_eay.c.fips 2008-09-14 15:51:44.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/rsa/rsa_eay.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rsa/rsa_eay.c 2010-02-16 22:58:31.000000000 +0100
@@ -114,6 +114,10 @@
#include <openssl/bn.h>
#include <openssl/rsa.h>
@@ -11323,7 +11403,7 @@ diff -up openssl-1.0.0-beta5/crypto/rsa/
}
diff -up openssl-1.0.0-beta5/crypto/rsa/rsa_err.c.fips openssl-1.0.0-beta5/crypto/rsa/rsa_err.c
--- openssl-1.0.0-beta5/crypto/rsa/rsa_err.c.fips 2008-12-29 17:11:56.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rsa/rsa_err.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rsa/rsa_err.c 2010-02-16 22:58:31.000000000 +0100
@@ -111,8 +111,12 @@ static ERR_STRING_DATA RSA_str_functs[]=
{ERR_FUNC(RSA_F_RSA_PRINT_FP), "RSA_print_fp"},
{ERR_FUNC(RSA_F_RSA_PRIV_DECODE), "RSA_PRIV_DECODE"},
@@ -11352,7 +11432,7 @@ diff -up openssl-1.0.0-beta5/crypto/rsa/
{ERR_REASON(RSA_R_P_NOT_PRIME) ,"p not prime"},
diff -up openssl-1.0.0-beta5/crypto/rsa/rsa_gen.c.fips openssl-1.0.0-beta5/crypto/rsa/rsa_gen.c
--- openssl-1.0.0-beta5/crypto/rsa/rsa_gen.c.fips 2007-03-28 02:15:27.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/rsa/rsa_gen.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rsa/rsa_gen.c 2010-02-16 22:58:31.000000000 +0100
@@ -67,6 +67,82 @@
#include "cryptlib.h"
#include <openssl/bn.h>
@@ -11479,8 +11559,8 @@ diff -up openssl-1.0.0-beta5/crypto/rsa/
err:
if (ok == -1)
diff -up openssl-1.0.0-beta5/crypto/rsa/rsa.h.fips openssl-1.0.0-beta5/crypto/rsa/rsa.h
---- openssl-1.0.0-beta5/crypto/rsa/rsa.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rsa/rsa.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/rsa/rsa.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rsa/rsa.h 2010-02-16 22:58:31.000000000 +0100
@@ -74,6 +74,21 @@
#error RSA is disabled.
#endif
@@ -11552,7 +11632,7 @@ diff -up openssl-1.0.0-beta5/crypto/rsa/
#define RSA_R_P_NOT_PRIME 128
diff -up openssl-1.0.0-beta5/crypto/rsa/rsa_lib.c.fips openssl-1.0.0-beta5/crypto/rsa/rsa_lib.c
--- openssl-1.0.0-beta5/crypto/rsa/rsa_lib.c.fips 2009-12-09 14:38:20.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/rsa/rsa_lib.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rsa/rsa_lib.c 2010-02-16 22:58:31.000000000 +0100
@@ -80,6 +80,13 @@ RSA *RSA_new(void)
void RSA_set_default_method(const RSA_METHOD *meth)
@@ -11630,7 +11710,7 @@ diff -up openssl-1.0.0-beta5/crypto/rsa/
diff -up openssl-1.0.0-beta5/crypto/rsa/rsa_sign.c.fips openssl-1.0.0-beta5/crypto/rsa/rsa_sign.c
--- openssl-1.0.0-beta5/crypto/rsa/rsa_sign.c.fips 2007-04-24 03:05:42.000000000 +0200
-+++ openssl-1.0.0-beta5/crypto/rsa/rsa_sign.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/rsa/rsa_sign.c 2010-02-16 22:58:31.000000000 +0100
@@ -130,7 +130,8 @@ int RSA_sign(int type, const unsigned ch
i2d_X509_SIG(&sig,&p);
s=tmps;
@@ -11662,9 +11742,54 @@ diff -up openssl-1.0.0-beta5/crypto/rsa/
if (i <= 0) goto err;
+diff -up openssl-1.0.0-beta5/crypto/seed/seed.c.fips openssl-1.0.0-beta5/crypto/seed/seed.c
+--- openssl-1.0.0-beta5/crypto/seed/seed.c.fips 2008-12-16 08:41:21.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/seed/seed.c 2010-02-16 23:43:46.000000000 +0100
+@@ -34,6 +34,9 @@
+
+ #include <openssl/seed.h>
+ #include "seed_locl.h"
++#ifdef OPENSSL_FIPS
++#include <openssl/fips.h>
++#endif
+
+ static const seed_word SS[4][256] = { {
+ 0x2989a1a8, 0x05858184, 0x16c6d2d4, 0x13c3d3d0, 0x14445054, 0x1d0d111c, 0x2c8ca0ac, 0x25052124,
+@@ -193,7 +196,18 @@ static const seed_word KC[] = {
+ KC8, KC9, KC10, KC11, KC12, KC13, KC14, KC15 };
+ #endif
+
++#ifdef OPENSSL_FIPS
+ void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH], SEED_KEY_SCHEDULE *ks)
++ {
++ if (FIPS_mode())
++ FIPS_BAD_ABORT(SEED)
++ private_SEED_set_key(rawkey, ks);
++ }
++
++void private_SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH], SEED_KEY_SCHEDULE *ks)
++#else
++void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH], SEED_KEY_SCHEDULE *ks)
++#endif
+ {
+ seed_word x1, x2, x3, x4;
+ seed_word t0, t1;
+diff -up openssl-1.0.0-beta5/crypto/seed/seed.h.fips openssl-1.0.0-beta5/crypto/seed/seed.h
+--- openssl-1.0.0-beta5/crypto/seed/seed.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/seed/seed.h 2010-02-16 23:35:57.000000000 +0100
+@@ -117,6 +117,9 @@ typedef struct seed_key_st {
+ } SEED_KEY_SCHEDULE;
+
+
++#ifdef OPENSSL_FIPS
++void private_SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH], SEED_KEY_SCHEDULE *ks);
++#endif
+ void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH], SEED_KEY_SCHEDULE *ks);
+
+ void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE], unsigned char d[SEED_BLOCK_SIZE], const SEED_KEY_SCHEDULE *ks);
diff -up openssl-1.0.0-beta5/crypto/sha/sha_dgst.c.fips openssl-1.0.0-beta5/crypto/sha/sha_dgst.c
--- openssl-1.0.0-beta5/crypto/sha/sha_dgst.c.fips 2007-01-21 14:07:14.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/sha/sha_dgst.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/sha/sha_dgst.c 2010-02-16 22:58:31.000000000 +0100
@@ -57,6 +57,12 @@
*/
@@ -11679,8 +11804,8 @@ diff -up openssl-1.0.0-beta5/crypto/sha/
#undef SHA_1
diff -up openssl-1.0.0-beta5/crypto/sha/sha.h.fips openssl-1.0.0-beta5/crypto/sha/sha.h
---- openssl-1.0.0-beta5/crypto/sha/sha.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/sha/sha.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/sha/sha.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/sha/sha.h 2010-02-16 22:58:31.000000000 +0100
@@ -106,6 +106,9 @@ typedef struct SHAstate_st
} SHA_CTX;
@@ -11692,8 +11817,8 @@ diff -up openssl-1.0.0-beta5/crypto/sha/
int SHA_Update(SHA_CTX *c, const void *data, size_t len);
int SHA_Final(unsigned char *md, SHA_CTX *c);
diff -up openssl-1.0.0-beta5/crypto/sha/sha_locl.h.fips openssl-1.0.0-beta5/crypto/sha/sha_locl.h
---- openssl-1.0.0-beta5/crypto/sha/sha_locl.h.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/sha/sha_locl.h 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/crypto/sha/sha_locl.h.fips 2010-02-16 22:58:30.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/sha/sha_locl.h 2010-02-16 22:58:31.000000000 +0100
@@ -122,8 +122,15 @@ void sha1_block_data_order (SHA_CTX *c,
#define INIT_DATA_h3 0x10325476UL
#define INIT_DATA_h4 0xc3d2e1f0UL
@@ -11712,7 +11837,7 @@ diff -up openssl-1.0.0-beta5/crypto/sha/
c->h1=INIT_DATA_h1;
diff -up openssl-1.0.0-beta5/crypto/sha/sha1dgst.c.fips openssl-1.0.0-beta5/crypto/sha/sha1dgst.c
--- openssl-1.0.0-beta5/crypto/sha/sha1dgst.c.fips 2007-01-21 14:07:14.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/sha/sha1dgst.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/sha/sha1dgst.c 2010-02-16 22:58:31.000000000 +0100
@@ -63,6 +63,10 @@
#define SHA_1
@@ -11726,7 +11851,7 @@ diff -up openssl-1.0.0-beta5/crypto/sha/
diff -up openssl-1.0.0-beta5/crypto/sha/sha256.c.fips openssl-1.0.0-beta5/crypto/sha/sha256.c
--- openssl-1.0.0-beta5/crypto/sha/sha256.c.fips 2007-01-21 14:07:14.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/sha/sha256.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/sha/sha256.c 2010-02-16 22:58:31.000000000 +0100
@@ -12,12 +12,19 @@
#include <openssl/crypto.h>
@@ -11759,7 +11884,7 @@ diff -up openssl-1.0.0-beta5/crypto/sha/
c->h[2]=0x3c6ef372UL; c->h[3]=0xa54ff53aUL;
diff -up openssl-1.0.0-beta5/crypto/sha/sha512.c.fips openssl-1.0.0-beta5/crypto/sha/sha512.c
--- openssl-1.0.0-beta5/crypto/sha/sha512.c.fips 2009-12-30 12:53:33.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/sha/sha512.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/sha/sha512.c 2010-02-16 22:58:31.000000000 +0100
@@ -5,6 +5,10 @@
* ====================================================================
*/
@@ -11791,9 +11916,38 @@ diff -up openssl-1.0.0-beta5/crypto/sha/
#if defined(SHA512_ASM) && (defined(__arm__) || defined(__arm))
/* maintain dword order required by assembler module */
unsigned int *h = (unsigned int *)c->h;
+diff -up openssl-1.0.0-beta5/crypto/whrlpool/whrlpool.h.fips openssl-1.0.0-beta5/crypto/whrlpool/whrlpool.h
+--- openssl-1.0.0-beta5/crypto/whrlpool/whrlpool.h.fips 2010-02-16 23:41:05.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/whrlpool/whrlpool.h 2010-02-16 23:40:39.000000000 +0100
+@@ -24,6 +24,9 @@ typedef struct {
+ } WHIRLPOOL_CTX;
+
+ #ifndef OPENSSL_NO_WHIRLPOOL
++#ifdef OPENSSL_FIPS
++int private_WHIRLPOOL_Init(WHIRLPOOL_CTX *c);
++#endif
+ int WHIRLPOOL_Init (WHIRLPOOL_CTX *c);
+ int WHIRLPOOL_Update (WHIRLPOOL_CTX *c,const void *inp,size_t bytes);
+ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c,const void *inp,size_t bits);
+diff -up openssl-1.0.0-beta5/crypto/whrlpool/wp_dgst.c.fips openssl-1.0.0-beta5/crypto/whrlpool/wp_dgst.c
+--- openssl-1.0.0-beta5/crypto/whrlpool/wp_dgst.c.fips 2008-12-29 13:35:49.000000000 +0100
++++ openssl-1.0.0-beta5/crypto/whrlpool/wp_dgst.c 2010-02-16 23:42:49.000000000 +0100
+@@ -53,8 +53,11 @@
+
+ #include "wp_locl.h"
+ #include <string.h>
++#ifdef OPENSSL_FIPS
++#include <openssl/fips.h>
++#endif
+
+-int WHIRLPOOL_Init (WHIRLPOOL_CTX *c)
++FIPS_NON_FIPS_MD_Init(WHIRLPOOL)
+ {
+ memset (c,0,sizeof(*c));
+ return(1);
diff -up openssl-1.0.0-beta5/Makefile.org.fips openssl-1.0.0-beta5/Makefile.org
---- openssl-1.0.0-beta5/Makefile.org.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/Makefile.org 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/Makefile.org.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/Makefile.org 2010-02-16 22:58:31.000000000 +0100
@@ -110,6 +110,9 @@ LIBKRB5=
ZLIB_INCLUDE=
LIBZLIB=
@@ -11823,7 +11977,7 @@ diff -up openssl-1.0.0-beta5/Makefile.or
# which in turn eliminates ambiguities in variable treatment with -e.
diff -up openssl-1.0.0-beta5/ssl/ssl_ciph.c.fips openssl-1.0.0-beta5/ssl/ssl_ciph.c
--- openssl-1.0.0-beta5/ssl/ssl_ciph.c.fips 2009-09-13 01:18:09.000000000 +0200
-+++ openssl-1.0.0-beta5/ssl/ssl_ciph.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/ssl/ssl_ciph.c 2010-02-16 22:58:31.000000000 +0100
@@ -727,6 +727,9 @@ static void ssl_cipher_collect_ciphers(c
!(c->algorithm_auth & disabled_auth) &&
!(c->algorithm_enc & disabled_enc) &&
@@ -11848,7 +12002,7 @@ diff -up openssl-1.0.0-beta5/ssl/ssl_cip
#ifdef CIPHER_DEBUG
diff -up openssl-1.0.0-beta5/ssl/ssl_lib.c.fips openssl-1.0.0-beta5/ssl/ssl_lib.c
--- openssl-1.0.0-beta5/ssl/ssl_lib.c.fips 2010-01-07 20:05:03.000000000 +0100
-+++ openssl-1.0.0-beta5/ssl/ssl_lib.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/ssl/ssl_lib.c 2010-02-16 22:58:31.000000000 +0100
@@ -1521,6 +1521,14 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m
return(NULL);
}
@@ -11865,8 +12019,8 @@ diff -up openssl-1.0.0-beta5/ssl/ssl_lib
{
SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_X509_VERIFICATION_SETUP_PROBLEMS);
diff -up openssl-1.0.0-beta5/ssl/ssltest.c.fips openssl-1.0.0-beta5/ssl/ssltest.c
---- openssl-1.0.0-beta5/ssl/ssltest.c.fips 2010-01-20 18:13:45.000000000 +0100
-+++ openssl-1.0.0-beta5/ssl/ssltest.c 2010-01-20 18:13:46.000000000 +0100
+--- openssl-1.0.0-beta5/ssl/ssltest.c.fips 2010-02-16 22:58:31.000000000 +0100
++++ openssl-1.0.0-beta5/ssl/ssltest.c 2010-02-16 22:58:31.000000000 +0100
@@ -266,6 +266,9 @@ static void sv_usage(void)
{
fprintf(stderr,"usage: ssltest [args ...]\n");
@@ -11943,7 +12097,7 @@ diff -up openssl-1.0.0-beta5/ssl/ssltest
# endif
diff -up openssl-1.0.0-beta5/ssl/s23_clnt.c.fips openssl-1.0.0-beta5/ssl/s23_clnt.c
--- openssl-1.0.0-beta5/ssl/s23_clnt.c.fips 2009-11-18 15:45:32.000000000 +0100
-+++ openssl-1.0.0-beta5/ssl/s23_clnt.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/ssl/s23_clnt.c 2010-02-16 22:58:31.000000000 +0100
@@ -337,6 +337,14 @@ static int ssl23_client_hello(SSL *s)
version_major = TLS1_VERSION_MAJOR;
version_minor = TLS1_VERSION_MINOR;
@@ -11976,7 +12130,7 @@ diff -up openssl-1.0.0-beta5/ssl/s23_cln
}
diff -up openssl-1.0.0-beta5/ssl/s23_srvr.c.fips openssl-1.0.0-beta5/ssl/s23_srvr.c
--- openssl-1.0.0-beta5/ssl/s23_srvr.c.fips 2010-01-13 20:08:29.000000000 +0100
-+++ openssl-1.0.0-beta5/ssl/s23_srvr.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/ssl/s23_srvr.c 2010-02-16 22:58:31.000000000 +0100
@@ -393,6 +393,15 @@ int ssl23_get_client_hello(SSL *s)
}
}
@@ -11995,7 +12149,7 @@ diff -up openssl-1.0.0-beta5/ssl/s23_srv
/* we have SSLv3/TLSv1 in an SSLv2 header
diff -up openssl-1.0.0-beta5/ssl/s3_clnt.c.fips openssl-1.0.0-beta5/ssl/s3_clnt.c
--- openssl-1.0.0-beta5/ssl/s3_clnt.c.fips 2010-01-05 17:46:39.000000000 +0100
-+++ openssl-1.0.0-beta5/ssl/s3_clnt.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/ssl/s3_clnt.c 2010-02-16 22:58:31.000000000 +0100
@@ -156,6 +156,10 @@
#include <openssl/objects.h>
#include <openssl/evp.h>
@@ -12018,7 +12172,7 @@ diff -up openssl-1.0.0-beta5/ssl/s3_clnt
EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
diff -up openssl-1.0.0-beta5/ssl/s3_enc.c.fips openssl-1.0.0-beta5/ssl/s3_enc.c
--- openssl-1.0.0-beta5/ssl/s3_enc.c.fips 2009-04-16 19:22:50.000000000 +0200
-+++ openssl-1.0.0-beta5/ssl/s3_enc.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/ssl/s3_enc.c 2010-02-16 22:58:31.000000000 +0100
@@ -170,6 +170,7 @@ static int ssl3_generate_key_block(SSL *
#endif
k=0;
@@ -12046,7 +12200,7 @@ diff -up openssl-1.0.0-beta5/ssl/s3_enc.
if (n < 0)
diff -up openssl-1.0.0-beta5/ssl/s3_srvr.c.fips openssl-1.0.0-beta5/ssl/s3_srvr.c
--- openssl-1.0.0-beta5/ssl/s3_srvr.c.fips 2010-01-01 15:39:51.000000000 +0100
-+++ openssl-1.0.0-beta5/ssl/s3_srvr.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/ssl/s3_srvr.c 2010-02-16 22:58:31.000000000 +0100
@@ -1732,6 +1732,8 @@ int ssl3_send_server_key_exchange(SSL *s
j=0;
for (num=2; num > 0; num--)
@@ -12058,7 +12212,7 @@ diff -up openssl-1.0.0-beta5/ssl/s3_srvr
EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
diff -up openssl-1.0.0-beta5/ssl/t1_enc.c.fips openssl-1.0.0-beta5/ssl/t1_enc.c
--- openssl-1.0.0-beta5/ssl/t1_enc.c.fips 2009-04-19 20:03:13.000000000 +0200
-+++ openssl-1.0.0-beta5/ssl/t1_enc.c 2010-01-20 18:13:46.000000000 +0100
++++ openssl-1.0.0-beta5/ssl/t1_enc.c 2010-02-16 22:58:31.000000000 +0100
@@ -169,6 +169,8 @@ static void tls1_P_hash(const EVP_MD *md
HMAC_CTX_init(&ctx);
Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- openssl.spec 12 Feb 2010 17:20:50 -0000 1.157
+++ openssl.spec 16 Feb 2010 22:54:12 -0000 1.158
@@ -23,7 +23,7 @@
Summary: A general purpose cryptography library with TLS implementation
Name: openssl
Version: 1.0.0
-Release: 0.21.%{beta}%{?dist}
+Release: 0.22.%{beta}%{?dist}
# We remove certain patented algorithms from the openssl source tarball
# with the hobble-openssl script which is included below.
Source: openssl-%{version}-%{beta}-usa.tar.bz2
@@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
%postun -p /sbin/ldconfig
%changelog
+* Tue Feb 16 2010 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.22.beta5
+- make TLS work in the FIPS mode
+
* Fri Feb 12 2010 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.21.beta5
- gracefully handle zero length in assembler implementations of
OPENSSL_cleanse (#564029)
- Previous message: rpms/hfsplus-tools/devel hfsplus-tools-332.14-add-needed.patch, NONE, 1.1 hfsplus-tools.spec, 1.11, 1.12
- Next message: rpms/device-mapper-multipath/devel 0012-RH-udev-sync-support.patch, NONE, 1.1 0023-RHBZ-557810-emc-invista-config.patch, NONE, 1.1 0024-RHBZ-565933-checker-timeout.patch, NONE, 1.1 0013-RH-add-weighted_prio-prioritizer.patch, 1.1, 1.2 0021-RHBZ-548874-add-find-multipaths.patch, 1.1, 1.2 0022-RHBZ-557845-RHEL5-style-partitions.patch, 1.1, 1.2 device-mapper-multipath.spec, 1.65, 1.66 0012-RH-explicitly-disable-dm-udev-sync-support-in-kpartx.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list