[prev in list] [next in list] [prev in thread] [next in thread]
List: openssl-cvs
Subject: [CVS] OpenSSL: OpenSSL_0_9_7-stable: openssl/ Makefile.org openssl/fip...
From: "Ben Laurie" <ben () openssl ! org>
Date: 2003-07-27 21:13:36
[Download RAW message or body]
OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________________________
Server: cvs.openssl.org Name: Ben Laurie
Root: /e/openssl/cvs Email: ben@openssl.org
Module: openssl Date: 27-Jul-2003 23:13:35
Branch: OpenSSL_0_9_7-stable Handle: 2003072722133203
Modified files: (Branch: OpenSSL_0_9_7-stable)
openssl Makefile.org
openssl/fips fips_check_sha1
openssl/fips/aes fips_aesavs.c
openssl/fips/dsa fips_dsa_ossl.c fips_dsatest.c
openssl/fips/sha1 fingerprint.sha1 fips_sha1dgst.c
fips_standalone_sha1.c standalone.sha1
Log:
Build when not FIPS.
Summary:
Revision Changes Path
1.154.2.68 +1 -1 openssl/Makefile.org
1.1.2.2 +2 -0 openssl/fips/aes/fips_aesavs.c
1.1.2.2 +8 -0 openssl/fips/dsa/fips_dsa_ossl.c
1.1.2.2 +2 -1 openssl/fips/dsa/fips_dsatest.c
1.1.2.3 +2 -1 openssl/fips/fips_check_sha1
1.1.2.2 +1 -1 openssl/fips/sha1/fingerprint.sha1
1.1.2.2 +5 -1 openssl/fips/sha1/fips_sha1dgst.c
1.1.2.2 +2 -0 openssl/fips/sha1/fips_standalone_sha1.c
1.1.2.2 +1 -1 openssl/fips/sha1/standalone.sha1
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openssl/Makefile.org
============================================================================
$ cvs diff -u -r1.154.2.67 -r1.154.2.68 Makefile.org
--- openssl/Makefile.org 27 Jul 2003 17:00:09 -0000 1.154.2.67
+++ openssl/Makefile.org 27 Jul 2003 21:13:32 -0000 1.154.2.68
@@ -173,7 +173,7 @@
# we might set SHLIB_MARK to '$(SHARED_LIBS)'.
SHLIB_MARK=
-DIRS= fips crypto ssl $(SHLIB_MARK) apps test tools
+DIRS= crypto fips ssl $(SHLIB_MARK) apps test tools
SHLIBDIRS= fips crypto ssl
# dirs in crypto to build
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/aes/fips_aesavs.c
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 fips_aesavs.c
--- openssl/fips/aes/fips_aesavs.c 27 Jul 2003 17:00:29 -0000 1.1.2.1
+++ openssl/fips/aes/fips_aesavs.c 27 Jul 2003 21:13:34 -0000 1.1.2.2
@@ -836,7 +836,9 @@
exit(0);
*/
+#ifdef FIPS
FIPS_mode_set(1);
+#endif
ERR_load_crypto_strings();
if (argc > 1)
{
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/dsa/fips_dsa_ossl.c
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 fips_dsa_ossl.c
--- openssl/fips/dsa/fips_dsa_ossl.c 27 Jul 2003 17:00:31 -0000 1.1.2.1
+++ openssl/fips/dsa/fips_dsa_ossl.c 27 Jul 2003 21:13:34 -0000 1.1.2.2
@@ -68,6 +68,8 @@
#endif
#include <openssl/fips.h>
+#ifdef FIPS
+
static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);
static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
@@ -364,3 +366,9 @@
{
return BN_mod_exp_mont(r, a, p, m, ctx, m_ctx);
}
+
+#else /* ndef FIPS */
+
+static void *dummy=&dummy;
+
+#endif /* ndef FIPS */
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/dsa/fips_dsatest.c
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 fips_dsatest.c
--- openssl/fips/dsa/fips_dsatest.c 27 Jul 2003 17:00:31 -0000 1.1.2.1
+++ openssl/fips/dsa/fips_dsatest.c 27 Jul 2003 21:13:34 -0000 1.1.2.2
@@ -143,8 +143,9 @@
unsigned char sig[256];
unsigned int siglen;
+#ifdef FIPS
FIPS_mode_set(1);
-
+#endif
if (bio_err == NULL)
bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/fips_check_sha1
============================================================================
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 fips_check_sha1
--- openssl/fips/fips_check_sha1 27 Jul 2003 17:19:28 -0000 1.1.2.2
+++ openssl/fips/fips_check_sha1 27 Jul 2003 21:13:33 -0000 1.1.2.3
@@ -3,5 +3,6 @@
FP=$1
shift
-$TOP/fips/sha1/fips_standalone_sha1 $@ | diff -u $FP -
+egrep '^CFLAG=.*-DFIPS ' $TOP/Makefile || exit 0
+$TOP/fips/sha1/fips_standalone_sha1 $@ | diff -u $FP -
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/sha1/fingerprint.sha1
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 fingerprint.sha1
--- openssl/fips/sha1/fingerprint.sha1 27 Jul 2003 17:00:33 -0000 1.1.2.1
+++ openssl/fips/sha1/fingerprint.sha1 27 Jul 2003 21:13:35 -0000 1.1.2.2
@@ -1,3 +1,3 @@
-SHA1(fips_sha1dgst.c)= 5b541eae6c5dc9caad9ad4fb90cb840ff48b5904
+SHA1(fips_sha1dgst.c)= 609e2cbf5d3cdcf318ec10238a0e82b93b78e6b5
SHA1(fips_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c
SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/sha1/fips_sha1dgst.c
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 fips_sha1dgst.c
--- openssl/fips/sha1/fips_sha1dgst.c 27 Jul 2003 17:00:33 -0000 1.1.2.1
+++ openssl/fips/sha1/fips_sha1dgst.c 27 Jul 2003 21:13:35 -0000 1.1.2.2
@@ -70,7 +70,11 @@
#include "fips_sha_locl.h"
-#endif /* def FIPS */
+#else /* ndef FIPS */
+
+static void *dummy=&dummy;
+
+#endif /* ndef FIPS */
#endif
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/sha1/fips_standalone_sha1.c
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 fips_standalone_sha1.c
--- openssl/fips/sha1/fips_standalone_sha1.c 27 Jul 2003 17:00:34 -0000 1.1.2.1
+++ openssl/fips/sha1/fips_standalone_sha1.c 27 Jul 2003 21:13:35 -0000 1.1.2.2
@@ -52,6 +52,7 @@
int main(int argc,char **argv)
{
+#ifdef FIPS
int n;
if(argc < 2)
@@ -97,5 +98,6 @@
printf("%02x",md[i]);
printf("\n");
}
+#endif
return 0;
}
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/sha1/standalone.sha1
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 standalone.sha1
--- openssl/fips/sha1/standalone.sha1 27 Jul 2003 17:00:34 -0000 1.1.2.1
+++ openssl/fips/sha1/standalone.sha1 27 Jul 2003 21:13:35 -0000 1.1.2.2
@@ -1,4 +1,4 @@
SHA1(fips_standalone_sha1.c)= b6c1f9f1ea9a231c0520460ee1e009f721fbc121
-SHA1(fips_sha1dgst.c)= 5b541eae6c5dc9caad9ad4fb90cb840ff48b5904
+SHA1(fips_sha1dgst.c)= 609e2cbf5d3cdcf318ec10238a0e82b93b78e6b5
SHA1(fips_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c
SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0
@@ .
______________________________________________________________________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List openssl-cvs@openssl.org
Automated List Manager majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic