Merge in all recent changes from 0.9.6-stable.

diff --git a/CHANGES b/CHANGES
index 2e37b908c03aedae8e9712776425bb03c09eca1c..a3d53f1161261fc80610598ee57c7a0e89d78405 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,8 @@
 
  Changes between 0.9.6d and 0.9.6e  [XX xxx XXXX]
 
-  *) 
+  *) Fix EVP_dsa_sha macro.
+     [Nils Larsch]
 
  Changes between 0.9.6c and 0.9.6d  [9 May 2002]
 

diff --git a/Configure b/Configure
index d2e9e03d996a4c3e214cd01cdd065234b66f31dc..a9d15a80f7b0691c5f707b338ffc90898f306e52 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -445,7 +445,7 @@ my %table=(
 "sco5-cc-pentium",  "cc:-Kpentium::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options?
 "sco5-gcc",  "gcc:-O3 -fomit-frame-pointer::(unknown):-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the SCO assembler doesn't seem to like our assembler files ...
 "sco5-cc-shared","cc:-belf:::-lsocket -lresolv -lnsl:MD2_CHAR RC4_INDEX ${x86_gcc_des}::::::::::dlfcn:svr3-shared:-Kpic",
-"sco5-gcc-shared","gcc:-O3 -DFILIO_H -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our assembler files ...
+"sco5-gcc-shared","gcc:-O3 -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our assembler files ...
 
 # Sinix/ReliantUNIX RM400
 # NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g  */

diff --git a/apps/apps.c b/apps/apps.c
index 167c319ebeb54256ba47b4238b70e805bd3e3e5f..be00a89b91c10503777e7a9a6be1ea7c0fc5d295 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -230,9 +230,16 @@ void program_name(char *in, char *out, int size)
 
        q=strrchr(p,'.');
        if (q == NULL)
-               q = in+size;
-       strncpy(out,p,q-p);
-       out[q-p]='\0';
+               q = p + strlen(p);
+       strncpy(out,p,size-1);
+       if (q-p >= size)
+               {
+               out[size-1]='\0';
+               }
+       else
+               {
+               out[q-p]='\0';
+               }
        }
 #else
 void program_name(char *in, char *out, int size)

diff --git a/config b/config
index 64291aaddaf72c417e1b470928a09501fe4202d7..b95af94c7a3b0476f0120f8377f04192fc182b89 100755 (executable)
--- a/config
+++ b/config
@@ -497,6 +497,10 @@ EOF
        ${CC} -o dummy dummy.c && OUT=`./dummy ${MACHINE}`
        rm dummy dummy.c
        ;;
+  ppc64-*-linux2)
+       #Use the standard target for PPC architecture until we create a
+       #special one for the 64bit architecture.
+       OUT="linux-ppc" ;;
   ppc-*-linux2) OUT="linux-ppc" ;;
   m68k-*-linux*) OUT="linux-m68k" ;;
   ia64-*-linux?) OUT="linux-ia64" ;;

diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index bbd510170b5103f2970ef0a205a47b4f8a028c4b..90011db544960b00e702987994cf27cd6ec08ae5 100644 (file)
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -56,6 +56,13 @@
  * [including the GNU Public Licence.]
  */
 
+/* disable assert() unless BIO_DEBUG has been defined */
+#ifndef BIO_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
+
 /* 
  * Stolen from tjh's ssl/ssl_trc.c stuff.
  */

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index d836e3bc3b61894f96acab08c06648ef3a384eeb..27970492a3ba816d562d73c37d24f0ca9ad401e4 100644 (file)
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -7,9 +7,18 @@
  * for which no specific BIO method is available.
  * See ssl/ssltest.c for some hints on how this can be used. */
 
+/* BIO_DEBUG implies BIO_PAIR_DEBUG */
+#ifdef BIO_DEBUG
+# ifndef BIO_PAIR_DEBUG
+#  define BIO_PAIR_DEBUG
+# endif
+#endif
+
+/* disable assert() unless BIO_PAIR_DEBUG has been defined */
 #ifndef BIO_PAIR_DEBUG
-# undef NDEBUG /* avoid conflicting definitions */
-# define NDEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
 #endif
 
 #include <assert.h>

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index c1ac366b1c11ffab3f302cd3195dadc1a7bec264..2bfb24f068db614872c8c66c524cd10e3c0b8ab5 100644 (file)
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -626,6 +626,7 @@ $   WRITE SYS$OUTPUT "      ",APPLICATION,".exe"
 $!
 $! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
 $!
+$   ON ERROR THEN GOTO NEXT_APPLICATION
 $   IF (RSAREF.EQS."TRUE")
 $   THEN
 $!

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 32d6e7c0355a30947fa3c0b9d5e67dcac25e588b..dd1b8fa2b8e00856841dcf521cb1a79586dd03fe 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -228,7 +228,7 @@ typedef struct evp_pkey_md_st
                        EVP_rsa_octet_string(),EVP_mdc2())
 #define EVP_dsa_sha() \
                EVP_PKEY_MD_add(NID_dsaWithSHA,\
-                       EVP_dsa(),EVP_mdc2())
+                       EVP_dsa(),EVP_sha())
 #define EVP_dsa_sha1() \
                EVP_PKEY_MD_add(NID_dsaWithSHA1,\
                        EVP_dsa(),EVP_sha1())

diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod
index ce99b5c345a12a93f654987d2602af621d1b0093..fa5d23e8dc3bc99c05a2d58af0f19f6bce17fe92 100644 (file)
--- a/doc/apps/smime.pod
+++ b/doc/apps/smime.pod
@@ -21,7 +21,6 @@ B<openssl> B<smime>
 [B<-certfile file>]
 [B<-signer file>]
 [B<-recip  file>]
-[B<-in file>]
 [B<-inform SMIME|PEM|DER>]
 [B<-passin arg>]
 [B<-inkey file>]

diff --git a/shlib/svr5-shared-gcc.sh b/shlib/svr5-shared-gcc.sh
index 2a359f63c4b114d8aed630e1bd59b9e7279a4464..2f86aadff4c607d3fb78bbe721a7394f8f0aa6c8 100755 (executable)
--- a/shlib/svr5-shared-gcc.sh
+++ b/shlib/svr5-shared-gcc.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/sh
 
 major="0"
-minor="9.6b"
+minor="9.6d"
 
 slib=libssl
 sh_slib=$slib.so.$major.$minor
@@ -9,7 +9,7 @@ sh_slib=$slib.so.$major.$minor
 clib=libcrypto
 sh_clib=$clib.so.$major.$minor
 
-FLAGS="-O3 -DFILIO_H -fomit-frame-pointer -pthread
+FLAGS="-O3 -DFILIO_H -fomit-frame-pointer -pthread"
 SHFLAGS="-DPIC -fPIC"
 
 touch $sh_clib

diff --git a/ssl/ssl-lib.com b/ssl/ssl-lib.com
index 436510dd67dd097ef5fd70784ea046150451c625..54390dedb9a4365353ce77d865a3ac74a9afd720 100644 (file)
--- a/ssl/ssl-lib.com
+++ b/ssl/ssl-lib.com
@@ -313,6 +313,7 @@ $ WRITE SYS$OUTPUT "Creating SSL_TASK OSU HTTP SSL Engine."
 $!
 $! Compile The File.
 $!
+$ ON ERROR GOTO SSL_TASK_END
 $ CC5/OBJECT='OBJ_DIR'SSL_TASK.OBJ SYS$DISK:[]SSL_TASK.C
 $!
 $! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
@@ -387,6 +388,7 @@ $ ENDIF
 $!
 $! Time To Return.
 $!
+$SSL_TASK_END:
 $ RETURN
 $!
 $! Check For The Link Option FIle.