Commit 980645e5 authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent changes from 0.9.6-stable.

parent 9d55e76d

CHANGES

+6 −1
Original line number Diff line number Diff line
@@ -4,7 +4,12 @@ 


 Changes between 0.9.6j and 0.9.6k  [xx XXX 2003]



  *) Change X509_cretificate_type() to mark the key as exported/exportable

  *) In ssl3_get_client_hello() (ssl/s3_srvr.c), tolerate additional

     extra data after the compression methods not only for TLS 1.0

     but also for SSL 3.0 (as required by the specification).

     [Bodo Moeller; problem pointed out by Matthias Loepfe]



  *) Change X509_certificate_type() to mark the key as exported/exportable

     when it's 512 *bits* long, not 512 bytes.

     [Richard Levitte]

Makefile.org

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ do_svr3-shared: 
		  find . -name "*.o" -print > allobjs ; \

		  OBJS= ; export OBJS ; \

		  for obj in `ar t lib$$i.a` ; do \

		    OBJS="$${OBJS} `grep $$obj allobjs`" ; \

		    OBJS="$${OBJS} `grep /$$obj allobjs`" ; \

		  done ; \

		  set -x; ${CC} ${SHARED_LDFLAGS} \

			-G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
@@ -390,7 +390,7 @@ do_svr5-shared: 
		  find . -name "*.o" -print > allobjs ; \

		  OBJS= ; export OBJS ; \

		  for obj in `ar t lib$$i.a` ; do \

		    OBJS="$${OBJS} `grep $$obj allobjs`" ; \

		    OBJS="$${OBJS} `grep /$$obj allobjs`" ; \

		  done ; \

		  set -x; ${CC} ${SHARED_LDFLAGS} \

			$${SHARE_FLAG} -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

apps/Makefile.ssl

+6 −2
Original line number Diff line number Diff line
@@ -136,8 +136,12 @@ $(DLIBCRYPTO): 


$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)

	$(RM) $(PROGRAM)

	if [ "$(SHLIB_TARGET)" = "" ] ; then \

	  $(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS); \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)

	  $(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS); \

	fi

	-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)



progs.h: progs.pl

crypto/bio/bss_bio.c

+54 −1
Original line number Diff line number Diff line 
/* crypto/bio/bss_bio.c  -*- Mode: C; c-file-style: "eay" -*- */

/* ====================================================================

 * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer. 

 *

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * 3. All advertising materials mentioning features or use of this

 *    software must display the following acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    openssl-core@openssl.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 *

 * This product includes cryptographic software written by Eric Young

 * (eay@cryptsoft.com).  This product includes software written by Tim

 * Hudson (tjh@cryptsoft.com).

 *

 */



/* Special method for a BIO where the other endpoint is also a BIO

 * of this kind, handled by the same thread (i.e. the "peer" is actually
@@ -503,7 +556,7 @@ static long bio_ctrl(BIO *bio, int cmd, long num, void *ptr) 
		break;

		

	case BIO_C_DESTROY_BIO_PAIR:

		/* Effects both BIOs in the pair -- call just once!

		/* Affects both BIOs in the pair -- call just once!

		 * Or let BIO_free(bio1); BIO_free(bio2); do the job. */

		bio_destroy_pair(bio);

		ret = 1;

crypto/rand/rand_win.c

+10 −4
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ typedef BOOL (WINAPI *GETCURSORINFO)(PCURSORINFO); 
typedef DWORD (WINAPI *GETQUEUESTATUS)(UINT);



typedef HANDLE (WINAPI *CREATETOOLHELP32SNAPSHOT)(DWORD, DWORD);

typedef BOOL (WINAPI *CLOSETOOLHELP32SNAPSHOT)(HANDLE);

typedef BOOL (WINAPI *HEAP32FIRST)(LPHEAPENTRY32, DWORD, DWORD);

typedef BOOL (WINAPI *HEAP32NEXT)(LPHEAPENTRY32);

typedef BOOL (WINAPI *HEAP32LIST)(HANDLE, LPHEAPLIST32);
@@ -423,6 +424,7 @@ int RAND_poll(void) 
	if (kernel)

		{

		CREATETOOLHELP32SNAPSHOT snap;

		CLOSETOOLHELP32SNAPSHOT close_snap;

		HANDLE handle;



		HEAP32FIRST heap_first;
@@ -440,6 +442,8 @@ int RAND_poll(void) 


		snap = (CREATETOOLHELP32SNAPSHOT)

			GetProcAddress(kernel, "CreateToolhelp32Snapshot");

		close_snap = (CLOSETOOLHELP32SNAPSHOT)

			GetProcAddress(kernel, "CloseToolhelp32Snapshot");

		heap_first = (HEAP32FIRST) GetProcAddress(kernel, "Heap32First");

		heap_next = (HEAP32NEXT) GetProcAddress(kernel, "Heap32Next");

		heaplist_first = (HEAP32LIST) GetProcAddress(kernel, "Heap32ListFirst");
@@ -455,7 +459,7 @@ int RAND_poll(void) 
			heaplist_next && process_first && process_next &&

			thread_first && thread_next && module_first &&

			module_next && (handle = snap(TH32CS_SNAPALL,0))

			!= NULL)

			!= INVALID_HANDLE_VALUE)

			{

			/* heap list and heap walking */

                        /* HEAPLIST32 contains 3 fields that will change with
@@ -517,7 +521,9 @@ int RAND_poll(void) 
				do

					RAND_add(&m, m.dwSize, 9);

				while (module_next(handle, &m));



			if (close_snap)

				close_snap(handle);

			else

				CloseHandle(handle);

			}