Commit c3bfe3f4 authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent changes from 0.9.6-stable.

parent d84a7271

CHANGES

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


 Changes between 0.9.6g and 0.9.6h  [xx XXX xxxx]



  *)

  *) Fix typo in OBJ_txt2obj which incorrectly passed the content

     length, instead of the encoding length to d2i_ASN1_OBJECT.

     [Steve Henson]



 Changes between 0.9.6f and 0.9.6g  [9 Aug 2002]

crypto/bn/bn.h

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ int BN_mod_mul_montgomery(BIGNUM *r,BIGNUM *a,BIGNUM *b,BN_MONT_CTX *mont, 
			  BN_CTX *ctx);

int BN_from_montgomery(BIGNUM *r,BIGNUM *a,BN_MONT_CTX *mont,BN_CTX *ctx);

void BN_MONT_CTX_free(BN_MONT_CTX *mont);

int BN_MONT_CTX_set(BN_MONT_CTX *mont,const BIGNUM *modulus,BN_CTX *ctx);

int BN_MONT_CTX_set(BN_MONT_CTX *mont,const BIGNUM *mod,BN_CTX *ctx);

BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to,BN_MONT_CTX *from);



BN_BLINDING *BN_BLINDING_new(BIGNUM *A,BIGNUM *Ai,BIGNUM *mod);

crypto/objects/obj_dat.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name) 
	a2d_ASN1_OBJECT(p,i,s,-1);

	

	p=buf;

	op=d2i_ASN1_OBJECT(NULL,&p,i);

	op=d2i_ASN1_OBJECT(NULL,&p,j);

	OPENSSL_free(buf);

	return op;

	}

ssl/ssl-lib.com

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ $ WRITE SYS$OUTPUT "Creating SSL_TASK OSU HTTP SSL Engine." 
$!

$! Compile The File.

$!

$ ON ERROR GOTO SSL_TASK_END

$ ON ERROR THEN 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.

ssl/ssltest.c

+11 −1
Original line number Diff line number Diff line
@@ -247,12 +247,22 @@ int main(int argc, char *argv[]) 
			debug=1;

		else if	(strcmp(*argv,"-reuse") == 0)

			reuse=1;

#ifndef NO_DH

		else if	(strcmp(*argv,"-dhe1024") == 0)

			{

#ifndef NO_DH

			dhe1024=1;

#else

			fprintf(stderr,"ignoring -dhe1024, since I'm compiled without DH\n";

#endif

			}

		else if	(strcmp(*argv,"-dhe1024dsa") == 0)

			{

#ifndef NO_DH

			dhe1024dsa=1;

#else

			fprintf(stderr,"ignoring -dhe1024, since I'm compiled without DH\n";

#endif

			}

		else if	(strcmp(*argv,"-no_dhe") == 0)

			no_dhe=1;

		else if	(strcmp(*argv,"-ssl2") == 0)