Recent changes from 0.9.7-stable

Since we have changed from using Makefile instead of Makefile.ssl, we
need to complete the work by changing all references.

make update

diff --git a/FAQ b/FAQ
index 0b40039ef81ea6e5c33a6801f2fb3f4a447da168..84b12afb11358cabf7889647a4060781b353b8ea 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -460,7 +460,7 @@ get the best result from OpenSSL.  A bit more complicated solution is the
 following:
 
 ----- snip:start -----
-  make DIRS=crypto SDIRS=sha "`grep '^CFLAG=' Makefile.ssl | \
+  make DIRS=crypto SDIRS=sha "`grep '^CFLAG=' Makefile | \
        sed -e 's/ -O[0-9] / -O0 /'`"
   rm `ls crypto/*.o crypto/sha/*.o | grep -v 'sha_dgst\.o'`
   make

diff --git a/INSTALL b/INSTALL
index 1c3f3c3fe92298d740f18014d1196b4dcf02c189..503474f2e4cef2f6f295348caaf37c9c795b1dba 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -123,7 +123,7 @@
      generic configurations "cc" or "gcc" should usually work on 32 bit
      systems.
 
-     Configure creates the file Makefile.ssl from Makefile.org and
+     Configure creates the file Makefile from Makefile.org and
      defines various macros in crypto/opensslconf.h (generated from
      crypto/opensslconf.h.in).
 
@@ -159,7 +159,7 @@
      the failure that isn't a problem in OpenSSL itself (like a missing
      or malfunctioning bc).  If it is a problem with OpenSSL itself,
      try removing any compiler optimization flags from the CFLAG line
-     in Makefile.ssl and run "make clean; make". Please send a bug
+     in Makefile and run "make clean; make". Please send a bug
      report to <openssl-bugs@openssl.org>, including the output of
      "make report" in order to be added to the request tracker at
      http://www.openssl.org/support/rt2.html.

diff --git a/PROBLEMS b/PROBLEMS
index 85e96a5ebebc9511f1bf58dcc205a0122d0a9623..d6731b1b134cc3b21126a136291554df6136d671 100644 (file)
--- a/PROBLEMS
+++ b/PROBLEMS
@@ -12,8 +12,8 @@ along the whole library path before it bothers looking for .a libraries.  This
 means that -L switches won't matter unless OpenSSL is built with shared
 library support.
 
-The workaround may be to change the following lines in apps/Makefile.ssl and
-test/Makefile.ssl:
+The workaround may be to change the following lines in apps/Makefile and
+test/Makefile:
 
   LIBCRYPTO=-L.. -lcrypto
   LIBSSL=-L.. -lssl

diff --git a/apps/Makefile b/apps/Makefile
index 1a2f1fd2a50ca98e94a752ef096899952be08550..166fe64603a7240a1e2988542db262516b206494 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -636,24 +636,25 @@ openssl.o: ../include/openssl/des.h ../include/openssl/des_old.h
 openssl.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 openssl.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
 openssl.o: ../include/openssl/err.h ../include/openssl/evp.h
-openssl.o: ../include/openssl/idea.h ../include/openssl/kssl.h
-openssl.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-openssl.o: ../include/openssl/md4.h ../include/openssl/md5.h
-openssl.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
-openssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-openssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-openssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-openssl.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-openssl.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-openssl.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-openssl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-openssl.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-openssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-openssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-openssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-openssl.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
-openssl.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
-openssl.o: ../include/openssl/x509_vfy.h apps.h openssl.c progs.h s_apps.h
+openssl.o: ../include/openssl/fips.h ../include/openssl/idea.h
+openssl.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
+openssl.o: ../include/openssl/md2.h ../include/openssl/md4.h
+openssl.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+openssl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+openssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+openssl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+openssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+openssl.o: ../include/openssl/rand.h ../include/openssl/rc2.h
+openssl.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+openssl.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+openssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+openssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+openssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+openssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+openssl.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
+openssl.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
+openssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+openssl.o: openssl.c progs.h s_apps.h
 passwd.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
 passwd.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
 passwd.o: ../include/openssl/bn.h ../include/openssl/buffer.h

diff --git a/apps/apps.c b/apps/apps.c
index ec5f5c1c90db73bec1733b0491372342ccd28e0a..0f15e27cd0fb87e18c097e5aceb3d2bd8989573b 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -330,41 +330,19 @@ void program_name(char *in, char *out, int size)
 #endif
 #endif
 
-#ifdef OPENSSL_SYS_WIN32
-int WIN32_rename(char *from, char *to)
-       {
-#ifndef OPENSSL_SYS_WINCE
-       /* Windows rename gives an error if 'to' exists, so delete it
-        * first and ignore file not found errror
-        */
-       if((remove(to) != 0) && (errno != ENOENT))
-               return -1;
-#undef rename
-       return rename(from, to);
-#else
-       /* convert strings to UNICODE */
+#ifdef OPENSSL_SYS_VMS
+int VMS_strcasecmp(const char *str1, const char *str2)
        {
-       BOOL result = FALSE;
-       WCHAR* wfrom;
-       WCHAR* wto;
-       int i;
-       wfrom = malloc((strlen(from)+1)*2);
-       wto = malloc((strlen(to)+1)*2);
-       if (wfrom != NULL && wto != NULL)
+       while (*str1 && *str2)
                {
-               for (i=0; i<(int)strlen(from)+1; i++)
-                       wfrom[i] = (short)from[i];
-               for (i=0; i<(int)strlen(to)+1; i++)
-                       wto[i] = (short)to[i];
-               result = MoveFile(wfrom, wto);
+               int res = toupper(*str1) - toupper(*str2);
+               if (res) return res < 0 ? -1 : 1;
                }
-       if (wfrom != NULL)
-               free(wfrom);
-       if (wto != NULL)
-               free(wto);
-       return result;
-       }
-#endif
+       if (*str1)
+               return 1;
+       if (*str2)
+               return -1;
+       return 0;
        }
 #endif
 
@@ -1950,3 +1928,42 @@ void free_index(CA_DB *db)
                OPENSSL_free(db);
                }
        }
+
+/* This code MUST COME AFTER anything that uses rename() */
+#ifdef OPENSSL_SYS_WIN32
+int WIN32_rename(char *from, char *to)
+       {
+#ifndef OPENSSL_SYS_WINCE
+       /* Windows rename gives an error if 'to' exists, so delete it
+        * first and ignore file not found errror
+        */
+       if((remove(to) != 0) && (errno != ENOENT))
+               return -1;
+#undef rename
+       return rename(from, to);
+#else
+       /* convert strings to UNICODE */
+       {
+       BOOL result = FALSE;
+       WCHAR* wfrom;
+       WCHAR* wto;
+       int i;
+       wfrom = malloc((strlen(from)+1)*2);
+       wto = malloc((strlen(to)+1)*2);
+       if (wfrom != NULL && wto != NULL)
+               {
+               for (i=0; i<(int)strlen(from)+1; i++)
+                       wfrom[i] = (short)from[i];
+               for (i=0; i<(int)strlen(to)+1; i++)
+                       wto[i] = (short)to[i];
+               result = MoveFile(wfrom, wto);
+               }
+       if (wfrom != NULL)
+               free(wfrom);
+       if (wto != NULL)
+               free(wto);
+       return result;
+       }
+#endif
+       }
+#endif

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 554474733fbcef6c5f6a8413ea1b20b560843158..4fe38ae1986dad717f3d47fcf5310ee97c352ce4 100644 (file)
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -214,13 +214,14 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                b->ptr=(char *)ptr;
                b->init=1;
                {
-               int fd = fileno((FILE*)ptr);
 #if defined(OPENSSL_SYS_WINDOWS)
+               int fd = fileno((FILE*)ptr);
                if (num & BIO_FP_TEXT)
                        _setmode(fd,_O_TEXT);
                else
                        _setmode(fd,_O_BINARY);
 #elif defined(OPENSSL_SYS_MSDOS)
+               int fd = fileno((FILE*)ptr);
                /* Set correct text/binary mode */
                if (num & BIO_FP_TEXT)
                        _setmode(fd,_O_TEXT);
@@ -236,6 +237,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                                _setmode(fd,_O_BINARY);
                        }
 #elif defined(OPENSSL_SYS_OS2)
+               int fd = fileno((FILE*)ptr);
                if (num & BIO_FP_TEXT)
                        setmode(fd, O_TEXT);
                else

diff --git a/crypto/bn/bntest.c b/crypto/bn/bntest.c
index 3c8c540387a46f266e3abcdbb2f795cad615a6f5..28cd3339da6fd2d1f5fe0dcc62b43b789dff0592 100644 (file)
--- a/crypto/bn/bntest.c
+++ b/crypto/bn/bntest.c
@@ -232,7 +232,7 @@ int main(int argc, char *argv[])
        EXIT(0);
 err:
        BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices
-                             * the failure, see test_bn in test/Makefile.ssl*/
+                             * the failure, see test_bn in test/Makefile */
        BIO_flush(out);
        ERR_load_crypto_strings();
        ERR_print_errors_fp(stderr);

diff --git a/crypto/des/FILES0 b/crypto/des/FILES0
index 4c7ea2de7a06ee199d6a54bf0cec8f850a933f9e..1c2e1f75b96fd656a4833fb4ce2fbc14636c08a0 100644 (file)
--- a/crypto/des/FILES0
+++ b/crypto/des/FILES0
@@ -8,7 +8,7 @@ README          - What this package is.
 VERSION                - Which version this is and what was changed.
 KERBEROS       - Kerberos version 4 notes.
 Makefile.PL    - An old makefile to build with perl5, not current.
-Makefile.ssl   - The SSLeay makefile
+Makefile       - The SSLeay makefile
 Makefile.uni   - The normal unix makefile.
 GNUmakefile    - The makefile for use with glibc.
 makefile.bc    - A Borland C makefile

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index f5d0843d139d80b217b051cfceb17a959fee23b8..c7fba496a83515912780f0fbaa44ac9e8e784b94 100644 (file)
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -166,6 +166,7 @@ int RAND_write_file(const char *file)
        }
 
 #if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32)
+       {
        /* For some reason Win32 can't write to files created this way */
        
        /* chmod(..., 0600) is too late to protect the file,
@@ -173,6 +174,7 @@ int RAND_write_file(const char *file)
        int fd = open(file, O_CREAT, 0600);
        if (fd != -1)
                out = fdopen(fd, "wb");
+       }
 #endif
        if (out == NULL)
                out = fopen(file,"wb");

diff --git a/doc/crypto/RSA_public_encrypt.pod b/doc/crypto/RSA_public_encrypt.pod
index d53e19d2b74924d4daf692b54951a95a4c0bd0cb..ab0fe3b2cd1c77b81178b56219d9d7e5e3d547de 100644 (file)
--- a/doc/crypto/RSA_public_encrypt.pod
+++ b/doc/crypto/RSA_public_encrypt.pod
@@ -47,9 +47,10 @@ Encrypting user data directly with RSA is insecure.
 =back
 
 B<flen> must be less than RSA_size(B<rsa>) - 11 for the PKCS #1 v1.5
-based padding modes, and less than RSA_size(B<rsa>) - 41 for
-RSA_PKCS1_OAEP_PADDING. The random number generator must be seeded
-prior to calling RSA_public_encrypt().
+based padding modes, less than RSA_size(B<rsa>) - 41 for
+RSA_PKCS1_OAEP_PADDING and exactly RSA_size(B<rsa>) for RSA_NO_PADDING.
+The random number generator must be seeded prior to calling
+RSA_public_encrypt().
 
 RSA_private_decrypt() decrypts the B<flen> bytes at B<from> using the
 private key B<rsa> and stores the plaintext in B<to>. B<to> must point

diff --git a/fips/rand/Makefile b/fips/rand/Makefile
index dfb7a10de859ef2a3282630a7f4b906d6d5d7c93..af359788b6cedfed6c63a2c8ddd73c659d488f33 100644 (file)
--- a/fips/rand/Makefile
+++ b/fips/rand/Makefile
@@ -90,10 +90,11 @@ fips_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 fips_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 fips_rand.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 fips_rand.o: fips_rand.c
-fips_randtest.o: ../../e_os.h ../../include/openssl/crypto.h
-fips_randtest.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-fips_randtest.o: ../../include/openssl/e_os2.h
-fips_randtest.o: ../../include/openssl/fips_rand.h
+fips_randtest.o: ../../e_os.h ../../include/openssl/bio.h
+fips_randtest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+fips_randtest.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
+fips_randtest.o: ../../include/openssl/err.h ../../include/openssl/fips_rand.h
+fips_randtest.o: ../../include/openssl/lhash.h
 fips_randtest.o: ../../include/openssl/opensslconf.h
 fips_randtest.o: ../../include/openssl/opensslv.h
 fips_randtest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h

diff --git a/shlib/hpux10-cc.sh b/shlib/hpux10-cc.sh
index 81eb9d4cababc18323eb9b2559f0b9f71107f7f6..fcadda827d703ee9123de4b0428e3ed6d252caad 100644 (file)
--- a/shlib/hpux10-cc.sh
+++ b/shlib/hpux10-cc.sh
@@ -74,9 +74,9 @@ make clean
 
 # Hack the Makefiles to pick up the dynamic libraries during linking
 #
-sed 's/^PEX_LIBS=.*$/PEX_LIBS=-L\/usr\/local\/ssl\/lib/' Makefile.ssl >xxx; mv xxx Makefile.ssl
-sed 's/-L\.\.//' apps/Makefile.ssl >xxx; mv xxx apps/Makefile.ssl
-sed 's/-L\.\.//' test/Makefile.ssl >xxx; mv xxx test/Makefile.ssl
+sed 's/^PEX_LIBS=.*$/PEX_LIBS=-L\/usr\/local\/ssl\/lib/' Makefile >xxx; mv xxx Makefile.ssl
+sed 's/-L\.\.//' apps/Makefile >xxx; mv xxx apps/Makefile
+sed 's/-L\.\.//' test/Makefile >xxx; mv xxx test/Makefile
 # Build the static libs and the executables in one make.
 make
 # Install everything

diff --git a/test/Makefile b/test/Makefile
index 672b4f95b265757bad0f65500b84cb845c6c76b4..593e37ea446486ac1ed093730f48d0781db0fce1 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -741,9 +741,10 @@ 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_randtest.o: ../e_os.h ../include/openssl/crypto.h ../include/openssl/des.h
-fips_randtest.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
-fips_randtest.o: ../include/openssl/fips_rand.h
+fips_randtest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/crypto.h
+fips_randtest.o: ../include/openssl/des.h ../include/openssl/des_old.h
+fips_randtest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+fips_randtest.o: ../include/openssl/fips_rand.h ../include/openssl/lhash.h
 fips_randtest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 fips_randtest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
 fips_randtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h

diff --git a/test/bctest b/test/bctest
index bdb3218f7acaa2cac934c96c62a402ba5677636c..e81fc0733a6bec553bc3986005536be034e9db45 100755 (executable)
--- a/test/bctest
+++ b/test/bctest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# This script is used by test/Makefile.ssl to check whether a sane 'bc'
+# This script is used by test/Makefile to check whether a sane 'bc'
 # is installed.
 # ('make test_bn' should not try to run 'bc' if it does not exist or if
 # it is a broken 'bc' version that is known to cause trouble.)

diff --git a/test/testenc b/test/testenc
index 0656c7f5254068fe4730d974d2d6e939f77bddcd..70505f02225c8f6c92027e206f81a620a79dd760 100644 (file)
--- a/test/testenc
+++ b/test/testenc
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-testsrc=Makefile.ssl
+testsrc=Makefile
 test=./p
 cmd=../apps/openssl
 

diff --git a/util/cygwin.sh b/util/cygwin.sh
index 930f766b4ffef9a531b8d10f93a599adc15272a9..f93b2a0db600796a557d9c2b68896d4a0cec6e61 100755 (executable)
--- a/util/cygwin.sh
+++ b/util/cygwin.sh
@@ -21,11 +21,11 @@ function cleanup()
 
 function get_openssl_version()
 {
-  eval `grep '^VERSION=' Makefile.ssl`
+  eval `grep '^VERSION=' Makefile`
   if [ -z "${VERSION}" ]
   then
-    echo "Error: Couldn't retrieve OpenSSL version from Makefile.ssl."
-    echo "       Check value of variable VERSION in Makefile.ssl."
+    echo "Error: Couldn't retrieve OpenSSL version from Makefile."
+    echo "       Check value of variable VERSION in Makefile."
     exit 1
   fi
 }

diff --git a/util/domd b/util/domd
index 49310bbdd1af808ec7f3587ddf2336be183b0573..5610521f0b832b504c0be9281578cb9b7e72c1c2 100755 (executable)
--- a/util/domd
+++ b/util/domd
@@ -11,7 +11,7 @@ if [ "$1" = "-MD" ]; then
 fi
 if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi
 
-cp Makefile.ssl Makefile.save
+cp Makefile Makefile.save
 # fake the presence of Kerberos
 touch $TOP/krb5.h
 if [ "$MAKEDEPEND" = "gcc" ]; then
@@ -20,15 +20,15 @@ if [ "$MAKEDEPEND" = "gcc" ]; then
        if [ "$1" != "--" ]; then args="$args $1"; fi
        shift
     done
-    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp
+    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
     echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
     gcc -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp
     ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
     rm -f Makefile.tmp
 else
-    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile.ssl $@
-    ${PERL} $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
+    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile $@
+    ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
 fi
-mv Makefile.new Makefile.ssl
+mv Makefile.new Makefile
 # unfake the presence of Kerberos
 rm $TOP/krb5.h

diff --git a/util/extract-names.pl b/util/extract-names.pl
index 744a8e2324e6cc7aaa2641d644ac2cfe1eeeafe8..35bd6ed84326f16ca6ffbdd7e99c8fa1b6a7cf1d 100644 (file)
--- a/util/extract-names.pl
+++ b/util/extract-names.pl
@@ -9,9 +9,11 @@ while(<STDIN>) {
     } elsif ($name) {
        if (/ - /) {
            s/ - .*//;
-           s/,[ \t]+/,/g;
-           s/^[ \t]+//g;
-           s/[ \t]+$//g;
+           s/,\s+/,/g;
+           s/\s+,/,/g;
+           s/^\s+//g;
+           s/\s+$//g;
+           s/\s/_/g;
            push @words, split ',';
        }
     }

diff --git a/util/fixNT.sh b/util/fixNT.sh
index ce4f19299ba52e00400a106f9a4500877faa7f8e..ab9e766b869900f46410d9a02727c38fae1e9bf5 100755 (executable)
--- a/util/fixNT.sh
+++ b/util/fixNT.sh
@@ -3,12 +3,12 @@
 # clean up the mess that NT makes of my source tree
 #
 
-if [ -f makefile.ssl -a ! -f Makefile.ssl ]; then
-       /bin/mv makefile.ssl Makefile.ssl
+if [ -f makefile -a ! -f Makefile ]; then
+       /bin/mv makefile Makefile
 fi
 chmod +x Configure util/*
 echo cleaning
 /bin/rm -f `find . -name '*.$$$' -print` 2>/dev/null >/dev/null
 echo 'removing those damn ^M'
 perl -pi -e 's/\015//' `find . -type 'f' -print |grep -v '.obj$' |grep -v '.der$' |grep -v '.gz'`
-make -f Makefile.ssl links
+make -f Makefile links

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 44c07550c6d76884219a660e804271a3975c0d3b..c1813a2c4a41816add807612825fc2a5d8686c05 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -10,7 +10,7 @@ $OPTIONS="";
 $ssl_version="";
 $banner="\t\@echo Building OpenSSL";
 
-open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n";
+open(IN,"<Makefile") || die "unable to open Makefile!\n";
 while(<IN>) {
     $ssl_version=$1 if (/^VERSION=(.*)$/);
     $OPTIONS=$1 if (/^OPTIONS=(.*)$/);
@@ -18,7 +18,7 @@ while(<IN>) {
 }
 close(IN);
 
-die "Makefile.ssl is not the toplevel Makefile!\n" if $ssl_version eq "";
+die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
 
 $infile="MINFO";
 
@@ -640,7 +640,7 @@ if ($platform eq "linux-elf") {
     print <<"EOF";
 # Generate perlasm output files
 %.cpp:
-       (cd \$(\@D)/..; PERL=perl make -f Makefile.ssl asm/\$(\@F))
+       (cd \$(\@D)/..; PERL=perl make -f Makefile asm/\$(\@F))
 EOF
 }
 print "###################################################################\n";

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 01a1bfda197c71506588d070e144ac8646ee709e..372d40cc531d9a09a48133485274c9ca9d1c6f60 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -94,7 +94,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         "FP_API", "STDIO", "SOCK", "KRB5", "ENGINE", "HW" );
 
 my $options="";
-open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n";
+open(IN,"<Makefile") || die "unable to open Makefile!\n";
 while(<IN>) {
     $options=$1 if (/^OPTIONS=(.*)$/);
 }
@@ -1119,7 +1119,7 @@ sub print_test_file
 sub get_version {
    local *MF;
    my $v = '?';
-   open MF, 'Makefile.ssl' or return $v;
+   open MF, 'Makefile' or return $v;
    while (<MF>) {
      $v = $1, last if /^VERSION=(.*?)\s*$/;
    }

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 888ee32bebd357311cef45f0553f2bbc2ef3f9fb..2ab548e68ce7909c02af13ffe70a9c88c33f3260 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -64,7 +64,7 @@ my @dirs = (
 );
 
 foreach (@dirs) {
-       &files_dir ($_, "Makefile.ssl");
+       &files_dir ($_, "Makefile");
 }
 
 exit(0);

diff --git a/util/pod2mantest b/util/pod2mantest
index 412ca8d6d88b0258edd3e81b06cfb253b874a23d..384e683df4cc7636fbf98251d421e62654cca08f 100755 (executable)
--- a/util/pod2mantest
+++ b/util/pod2mantest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# This script is used by test/Makefile.ssl to check whether a sane 'pod2man'
+# This script is used by test/Makefile to check whether a sane 'pod2man'
 # is installed.
 # ('make install' should not try to run 'pod2man' if it does not exist or if
 # it is a broken 'pod2man' version that is known to cause trouble. if we find

diff --git a/util/selftest.pl b/util/selftest.pl
index 276b81183d2922162c0c034867e9c11558f1d83e..e9d5aa8938ec3d1f2d3f9fa82d49b68ef0ff86a7 100644 (file)
--- a/util/selftest.pl
+++ b/util/selftest.pl
@@ -34,9 +34,9 @@ foreach $_ (split("\n",$c)) {
     $platform0=$1 if (/Configuring for (.*)$/);
 }
 
-system "sh config" if (! -f "Makefile.ssl");
+system "sh config" if (! -f "Makefile");
 
-if (open(IN,"<Makefile.ssl")) {
+if (open(IN,"<Makefile")) {
     while (<IN>) {
        $version=$1 if (/^VERSION=(.*)$/);
        $platform=$1 if (/^PLATFORM=(.*)$/);