Commit 9d55e76d authored by Richard Levitte's avatar Richard Levitte
Browse files

Bring 0.9.6 [engine] up to date with 0.9.6.

parent fd509d6d

CHANGES

+3 −1
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ 


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



  *) 

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

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

     [Richard Levitte]



 Changes between 0.9.6i and 0.9.6j  [10 Apr 2003]

bugs/SSLv3

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ RC4-MD5, but a re-connect tries to use DES-CBC-SHA. So netscape, when 
doing a re-connect, always takes the first cipher in the cipher list.



If we accept a netscape connection, demand a client cert, have a

non-self-sighed CA which does not have it's CA in netscape, and the

non-self-signed CA which does not have it's CA in netscape, and the

browser has a cert, it will crash/hang.  Works for 3.x and 4.xbeta



Netscape browsers do not really notice the server sending a

crypto/asn1/a_strex.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ int do_dump(unsigned long lflags, char_io *io_ch, void *arg, ASN1_STRING *str) 
 * otherwise it is the number of bytes per character

 */



const static char tag2nbyte[] = {

const static signed char tag2nbyte[] = {

	-1, -1, -1, -1, -1,	/* 0-4 */

	-1, -1, -1, -1, -1,	/* 5-9 */

	-1, -1, 0, -1,		/* 10-13 */

crypto/asn1/asn1.h

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ extern "C" { 
#define B_ASN1_NUMERICSTRING	0x0001

#define B_ASN1_PRINTABLESTRING	0x0002

#define B_ASN1_T61STRING	0x0004

#define B_ASN1_TELETEXSTRING	0x0008

#define B_ASN1_TELETEXSTRING	0x0004

#define B_ASN1_VIDEOTEXSTRING	0x0008

#define B_ASN1_IA5STRING	0x0010

#define B_ASN1_GRAPHICSTRING	0x0020

crypto/bio/b_print.c

+1 −1
Original line number Diff line number Diff line
@@ -825,5 +825,5 @@ int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) 
		 * had the buffer been large enough.) */

		return -1;

	else

		return (retlen <= INT_MAX) ? retlen : -1;

		return (retlen <= INT_MAX) ? (int)retlen : -1;

	}