7 files changed, 18 insertions, 11 deletions

diff --git a/src/lib/libssl/src/crypto/evp/enc_min.c b/src/lib/libssl/src/crypto/evp/enc_min.c
index 3cb4626bef..7fba38ee24 100644
--- a/src/lib/libssl/src/crypto/evp/enc_min.c
+++ b/src/lib/libssl/src/crypto/evp/enc_min.c
@@ -199,7 +199,7 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp
                         enc = 1;
                 ctx->encrypt = enc;
                 }
-#ifdef OPENSSL_NO_FIPS
+#ifdef OPENSSL_FIPS
         if(FIPS_selftest_failed())
                 {
                 FIPSerr(FIPS_F_EVP_CIPHERINIT_EX,FIPS_R_FIPS_SELFTEST_FAILED);
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_x931g.c b/src/lib/libssl/src/crypto/rsa/rsa_x931g.c
index c640cc2ec9..bf94f8be7a 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_x931g.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_x931g.c
@@ -79,9 +79,9 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1, BIGNUM *q2,
                 goto err;
 
         ctx = BN_CTX_new();
-        BN_CTX_start(ctx);
         if (!ctx) 
                 goto err;
+        BN_CTX_start(ctx);
 
         r0 = BN_CTX_get(ctx);
         r1 = BN_CTX_get(ctx);
@@ -190,7 +190,7 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1, BIGNUM *q2,
         if (ctx2)
                 BN_CTX_free(ctx2);
         /* If this is set all calls successful */
-        if (rsa->iqmp != NULL)
+        if (rsa && rsa->iqmp != NULL)
                 return 1;
 
         return 0;
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha1-ia64.pl b/src/lib/libssl/src/crypto/sha/asm/sha1-ia64.pl
index aa18c1089b..51c4f47ecb 100644
--- a/src/lib/libssl/src/crypto/sha/asm/sha1-ia64.pl
+++ b/src/lib/libssl/src/crypto/sha/asm/sha1-ia64.pl
@@ -302,4 +302,5 @@ $code.=<<___;
 stringz "SHA1 block transform for IA64, CRYPTOGAMS by <appro\@openssl.org>"
 ___
 
+$output=shift and open STDOUT,">$output";
 print $code;
diff --git a/src/lib/libssl/src/engines/makeengines.com b/src/lib/libssl/src/engines/makeengines.com
index 4a7474e010..840864f7cf 100644
--- a/src/lib/libssl/src/engines/makeengines.com
+++ b/src/lib/libssl/src/engines/makeengines.com
@@ -34,7 +34,7 @@ $! Set the names of the engines we want to build
 $!
 $ ENGINES = "," + P6
 $ IF ENGINES .EQS. "," THEN -
-        ENGINES = ",4758cca,aep,atalla,cswift,chil,nuron,sureware,ubsec"
+        ENGINES = ",4758cca,aep,atalla,cswift,chil,nuron,sureware,ubsec,capi"
 $!
 $! Set the default TCP/IP library to link against if needed
 $!
@@ -87,6 +87,7 @@ $ ENGINE_chil = "e_chil"
 $ ENGINE_nuron = "e_nuron"
 $ ENGINE_sureware = "e_sureware"
 $ ENGINE_ubsec = "e_ubsec"
+$ ENGINE_capi = "e_capi"
 $!
 $! Define which programs need to be linked with a TCP/IP library
 $!
diff --git a/src/lib/libssl/src/fips/Makefile b/src/lib/libssl/src/fips/Makefile
index d6dcb79a28..e038be8f13 100644
--- a/src/lib/libssl/src/fips/Makefile
+++ b/src/lib/libssl/src/fips/Makefile
@@ -123,7 +123,7 @@ fips_premain_dso$(EXE_EXT): fips_premain.c
                 $(FIPSLIBDIR)fipscanister.o ../libcrypto.a $(EX_LIBS)
 # this is executed only when linking with external fipscanister.o
 fips_standalone_sha1$(EXE_EXT): sha/fips_standalone_sha1.c
-        $(CC) $(CFLAGS) -DFIPSCANISTER_O -o $@ sha/fips_standalone_sha1.c $(FIPSLIBDIR)fipscanister.o
+        $(CC) $(CFLAGS) -DFIPSCANISTER_O -o $@ sha/fips_standalone_sha1.c $(FIPSLIBDIR)fipscanister.o $(EX_LIBS)
 
 subdirs:
         @target=all; $(RECURSIVE_MAKE)
@@ -179,8 +179,15 @@ install:
         chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
         done;
         @target=install; $(RECURSIVE_MAKE)
-        @cp -p -f fipscanister.o fipscanister.o.sha1 fips_premain.c \
-                fips_premain.c.sha1 \
+        for i in $(EXE) ; \
+        do \
+                echo "installing $$i"; \
+                cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
+                chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
+                mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
+        done
+        cp -p -f $(FIPSLIBDIR)fipscanister.o $(FIPSLIBDIR)fipscanister.o.sha1 \
+                $(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fips_premain.c.sha1 \
                 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/; \
         chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips*
 
diff --git a/src/lib/libssl/src/fips/aes/Makefile b/src/lib/libssl/src/fips/aes/Makefile
index 403525d4c0..7b8b3a26de 100644
--- a/src/lib/libssl/src/fips/aes/Makefile
+++ b/src/lib/libssl/src/fips/aes/Makefile
@@ -22,7 +22,6 @@ CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
 TEST=fips_aesavs.c
-TESTDATA=fips_aes_data
 APPS=
 
 LIB=$(TOP)/libcrypto.a
@@ -50,7 +49,6 @@ files:
 links:
         @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
         @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TESTDATA)
         @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
 
 install:
diff --git a/src/lib/libssl/src/fips/sha/fips_standalone_sha1.c b/src/lib/libssl/src/fips/sha/fips_standalone_sha1.c
index 058b71a20f..eec65dc39e 100644
--- a/src/lib/libssl/src/fips/sha/fips_standalone_sha1.c
+++ b/src/lib/libssl/src/fips/sha/fips_standalone_sha1.c
@@ -65,7 +65,7 @@ void OPENSSL_cleanse(void *p,size_t len) {}
 static void hmac_init(SHA_CTX *md_ctx,SHA_CTX *o_ctx,
                       const char *key)
     {
-    int len=strlen(key);
+    size_t len=strlen(key);
     int i;
     unsigned char keymd[HMAC_MAX_MD_CBLOCK];
     unsigned char pad[HMAC_MAX_MD_CBLOCK];
@@ -139,7 +139,7 @@ int main(int argc,char **argv)
         for( ; ; )
             {
             char buf[1024];
-            int l=fread(buf,1,sizeof buf,f);
+            size_t l=fread(buf,1,sizeof buf,f);
 
             if(l == 0)
                 {