Commit 8797be2d authored by Richard Levitte's avatar Richard Levitte
Browse files

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
parent 48e1c0c0

FAQ

+1 −1
Original line number Diff line number Diff line
@@ -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

INSTALL

+2 −2
Original line number Diff line number Diff line
@@ -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.

PROBLEMS

+2 −2
Original line number Diff line number Diff line
@@ -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

apps/Makefile

+19 −18
Original line number Diff line number Diff line
@@ -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

apps/apps.c

+49 −32
Original line number Diff line number Diff line
@@ -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)

#ifdef OPENSSL_SYS_VMS

int VMS_strcasecmp(const char *str1, const char *str2)

	{

#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 */

	while (*str1 && *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)

		{

		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;

		int res = toupper(*str1) - toupper(*str2);

		if (res) return res < 0 ? -1 : 1;

		}

#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