Time for release of 0.9.7i.

The tag will be OpenSSL_0_9_7i

diff --git a/CHANGES b/CHANGES
index 9946c4f45c45586c2c703e5c47de4362f7b06c8e..a60f7fef626addc2fa1ffc69b62937e19d366cc2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,14 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 0.9.7h and 0.9.7i  [XX xxx XXXX]
+ Changes between 0.9.7h and 0.9.7i  [14 Oct 2005]
+
+  *) Wrapped the definition of EVP_MAX_MD_SIZE in a #ifdef OPENSSL_FIPS.
+     The value now differs depending on if you build for FIPS or not.
+     BEWARE!  A program linked with a shared FIPSed libcrypto can't be
+     safely run with a non-FIPSed libcrypto, as it may crash because of
+     the difference induced by this change.
+     [Andy Polyakov]
 
  Changes between 0.9.7g and 0.9.7h  [11 Oct 2005]
 

diff --git a/FAQ b/FAQ
index 1a817350dfb1ec6b5beb91e5eb60cb1d61c3e2fa..bc1ebbd8505a5e177026281964d0dadfb9a5bf89 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -70,7 +70,7 @@ OpenSSL  -  Frequently Asked Questions
 * Which is the current version of OpenSSL?
 
 The current version is available from <URL: http://www.openssl.org>.
-OpenSSL 0.9.7h was released on October 11, 2005.
+OpenSSL 0.9.7i was released on October 14, 2005.
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:

diff --git a/NEWS b/NEWS
index 491c18aa36e2858a002ec8384c481aa781a276fd..9b0b7d24e002776793c27f8b8528a413514184b9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
+  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i:
+
+      o Give EVP_MAX_MD_SIZE it's old value, except for a FIPS build.
+
   Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h:
 
       o Fix SSL 2.0 Rollback, CAN-2005-2969

diff --git a/README b/README
index 4e54278249b0e78dd151c03014ca54b66d084771..241c1db9d63fdd7bcfc108ec6f4677ca14dc8b4b 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 0.9.7i XX xxx XXXX
+ OpenSSL 0.9.7i 14 Och 2005
 
  Copyright (c) 1998-2005 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

diff --git a/STATUS b/STATUS
index afd47f4e17b7ebd0bf1995c5a74e38cee407f63d..5c67474e8fa942b3500b105dac8fa140c8c67270 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,12 +1,13 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2005/10/11 10:10:03 $
+  ______________                           $Date: 2005/10/14 22:15:44 $
 
   DEVELOPMENT STATE
 
     o  OpenSSL 0.9.9:  Under development...
     o  OpenSSL 0.9.8a: Released on October   11th, 2005
     o  OpenSSL 0.9.8:  Released on July       5th, 2005
+    o  OpenSSL 0.9.7i: Released on October   14th, 2005
     o  OpenSSL 0.9.7h: Released on October   11th, 2005
     o  OpenSSL 0.9.7g: Released on April     11th, 2005
     o  OpenSSL 0.9.7f: Released on March     22nd, 2005

diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index 9f26bd51252597a5d139058eea56e10a87bd80db..b0bd65e839971e60bce10d1143e5bb16f10e3324 100644 (file)
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -329,3 +329,5 @@ bn_word.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bn_word.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
 bn_word.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 bn_word.o: ../cryptlib.h bn_lcl.h bn_word.c
+bn_x931p.o: ../../include/openssl/bn.h ../../include/openssl/e_os2.h
+bn_x931p.o: ../../include/openssl/opensslconf.h bn_x931p.c

diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 547d34d6a66ac97dc4bcecd73e77aab2a3bfb685..0e4b6c629d5e2d826a81da361be68414390a3cc8 100644 (file)
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -25,11 +25,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER 0x00907090L
+#define OPENSSL_VERSION_NUMBER 0x0090709fL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT   "OpenSSL 0.9.7i-fips-dev XX xxx XXXX"
+#define OPENSSL_VERSION_TEXT   "OpenSSL 0.9.7i-fips 14 Oct 2005"
 #else
-#define OPENSSL_VERSION_TEXT   "OpenSSL 0.9.7i-dev XX xxx XXXX"
+#define OPENSSL_VERSION_TEXT   "OpenSSL 0.9.7i 14 Oct 2005"
 #endif
 #define OPENSSL_VERSION_PTEXT  " part of " OPENSSL_VERSION_TEXT
 

diff --git a/fips/dsa/Makefile b/fips/dsa/Makefile
index a07bea4f5f09220bb9cafd3fd9892270b7dc24df..efe324e8528270b0824a052bc0ab2bb77d6b96e1 100644 (file)
--- a/fips/dsa/Makefile
+++ b/fips/dsa/Makefile
@@ -146,3 +146,4 @@ fips_dsatest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 fips_dsatest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 fips_dsatest.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 fips_dsatest.o: fips_dsatest.c
+fips_dssvs.o: ../../include/openssl/opensslconf.h fips_dssvs.c

diff --git a/fips/rand/Makefile b/fips/rand/Makefile
index 8ac67dbae294cbe6895faa9f02665415d6cb8a1f..8b97d26129f1c536f63f2f1dbbab522919da6c04 100644 (file)
--- a/fips/rand/Makefile
+++ b/fips/rand/Makefile
@@ -125,3 +125,4 @@ fips_randtest.o: ../../include/openssl/safestack.h
 fips_randtest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 fips_randtest.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 fips_randtest.o: fips_randtest.c
+fips_rngvs.o: ../../include/openssl/opensslconf.h fips_rngvs.c

diff --git a/fips/rsa/Makefile b/fips/rsa/Makefile
index c8ff0bc92be386bb119a5bef081f584f82337285..03986beb29345c220a1abbaed49152d567232fc3 100644 (file)
--- a/fips/rsa/Makefile
+++ b/fips/rsa/Makefile
@@ -126,6 +126,40 @@ fips_rsa_selftest.o: ../../include/openssl/rsa.h
 fips_rsa_selftest.o: ../../include/openssl/safestack.h
 fips_rsa_selftest.o: ../../include/openssl/stack.h
 fips_rsa_selftest.o: ../../include/openssl/symhacks.h fips_rsa_selftest.c
+fips_rsa_x931g.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+fips_rsa_x931g.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+fips_rsa_x931g.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+fips_rsa_x931g.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
+fips_rsa_x931g.o: ../../include/openssl/opensslconf.h
+fips_rsa_x931g.o: ../../include/openssl/opensslv.h
+fips_rsa_x931g.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h
+fips_rsa_x931g.o: ../../include/openssl/safestack.h
+fips_rsa_x931g.o: ../../include/openssl/stack.h
+fips_rsa_x931g.o: ../../include/openssl/symhacks.h fips_rsa_x931g.c
+fips_rsagtest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+fips_rsagtest.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+fips_rsagtest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+fips_rsagtest.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
+fips_rsagtest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+fips_rsagtest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
+fips_rsagtest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+fips_rsagtest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+fips_rsagtest.o: ../../include/openssl/hmac.h ../../include/openssl/idea.h
+fips_rsagtest.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+fips_rsagtest.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+fips_rsagtest.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+fips_rsagtest.o: ../../include/openssl/objects.h
+fips_rsagtest.o: ../../include/openssl/opensslconf.h
+fips_rsagtest.o: ../../include/openssl/opensslv.h
+fips_rsagtest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+fips_rsagtest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+fips_rsagtest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+fips_rsagtest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+fips_rsagtest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+fips_rsagtest.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+fips_rsagtest.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
+fips_rsagtest.o: ../../include/openssl/x509_vfy.h
+fips_rsagtest.o: ../../include/openssl/x509v3.h fips_rsagtest.c
 fips_rsastest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
 fips_rsastest.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 fips_rsastest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

diff --git a/fips/sha/Makefile b/fips/sha/Makefile
index ef00a1bb2a30da186bbb0be03627599ed6808fb7..026a81014caaac80273afc7aa1816a569385ffd4 100644 (file)
--- a/fips/sha/Makefile
+++ b/fips/sha/Makefile
@@ -137,8 +137,7 @@ fips_sha256.o: ../../include/openssl/fips.h ../../include/openssl/fips_sha.h
 fips_sha256.o: ../../include/openssl/opensslconf.h
 fips_sha256.o: ../../include/openssl/opensslv.h
 fips_sha256.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_sha256.o: ../../include/openssl/symhacks.h fips_md32_common.h
-fips_sha256.o: fips_sha256.c
+fips_sha256.o: ../../include/openssl/symhacks.h fips_sha256.c
 fips_sha512.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 fips_sha512.o: ../../include/openssl/fips.h ../../include/openssl/fips_sha.h
 fips_sha512.o: ../../include/openssl/opensslconf.h

diff --git a/openssl.spec b/openssl.spec
index 33d1d491b31e62256f9e1df3f0da94b3dda9c5f9..34bc6d43b48af4a7c983580057fdea4b39611b91 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,7 +1,7 @@
 %define libmaj 0
 %define libmin 9
 %define librel 7
-%define librev g
+%define librev i
 Release: 2
 
 %define openssldir /var/ssl

diff --git a/test/Makefile b/test/Makefile
index 919a55c39c8c244cff3cfe4a1d4572fe1364a1af..8d250327f3da2ac0224e19bbc90014fda81acd54 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -613,6 +613,7 @@ fips_dsatest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 fips_dsatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 fips_dsatest.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
 fips_dsatest.o: fips_dsatest.c
+fips_dssvs.o: ../include/openssl/opensslconf.h fips_dssvs.c
 fips_hmactest.o: ../include/openssl/aes.h ../include/openssl/asn1.h
 fips_hmactest.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
 fips_hmactest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -644,6 +645,29 @@ fips_randtest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
 fips_randtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
 fips_randtest.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
 fips_randtest.o: ../include/openssl/ui_compat.h fips_randtest.c
+fips_rngvs.o: ../include/openssl/opensslconf.h fips_rngvs.c
+fips_rsagtest.o: ../include/openssl/aes.h ../include/openssl/asn1.h
+fips_rsagtest.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
+fips_rsagtest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+fips_rsagtest.o: ../include/openssl/cast.h ../include/openssl/conf.h
+fips_rsagtest.o: ../include/openssl/crypto.h ../include/openssl/des.h
+fips_rsagtest.o: ../include/openssl/des_old.h ../include/openssl/dh.h
+fips_rsagtest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+fips_rsagtest.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_rsagtest.o: ../include/openssl/hmac.h ../include/openssl/idea.h
+fips_rsagtest.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+fips_rsagtest.o: ../include/openssl/md4.h ../include/openssl/md5.h
+fips_rsagtest.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+fips_rsagtest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+fips_rsagtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+fips_rsagtest.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+fips_rsagtest.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+fips_rsagtest.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+fips_rsagtest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+fips_rsagtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+fips_rsagtest.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
+fips_rsagtest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+fips_rsagtest.o: ../include/openssl/x509v3.h fips_rsagtest.c
 fips_rsastest.o: ../include/openssl/aes.h ../include/openssl/asn1.h
 fips_rsastest.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
 fips_rsastest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -710,6 +734,20 @@ fips_shatest.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
 fips_shatest.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
 fips_shatest.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h
 fips_shatest.o: fips_shatest.c
+fips_test_suite.o: ../include/openssl/aes.h ../include/openssl/asn1.h
+fips_test_suite.o: ../include/openssl/bio.h ../include/openssl/bn.h
+fips_test_suite.o: ../include/openssl/crypto.h ../include/openssl/des.h
+fips_test_suite.o: ../include/openssl/des_old.h ../include/openssl/dh.h
+fips_test_suite.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+fips_test_suite.o: ../include/openssl/err.h ../include/openssl/fips.h
+fips_test_suite.o: ../include/openssl/lhash.h ../include/openssl/md5.h
+fips_test_suite.o: ../include/openssl/opensslconf.h
+fips_test_suite.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+fips_test_suite.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+fips_test_suite.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+fips_test_suite.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+fips_test_suite.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
+fips_test_suite.o: fips_test_suite.c
 hmactest.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
 hmactest.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
 hmactest.o: ../include/openssl/bn.h ../include/openssl/cast.h