Commit 16c3ccca authored by Richard Levitte's avatar Richard Levitte
Browse files

Change expt to something else, as in 0.9.7-stable.

parent 302b9b0d

crypto/bio/b_print.c

+3 −3
Original line number Diff line number Diff line
@@ -565,12 +565,12 @@ abs_val(LDOUBLE value) 
}



static LDOUBLE

pow10(int exp)

pow10(int in_exp)

{

    LDOUBLE result = 1;

    while (exp) {

    while (in_exp) {

        result *= 10;

        exp--;

        in_exp--;

    }

    return result;

}

ssl/s3_enc.c

+6 −6
Original line number Diff line number Diff line
@@ -188,9 +188,9 @@ int ssl3_change_cipher_state(SSL *s, int which) 
	COMP_METHOD *comp;

	const EVP_MD *m;

	MD5_CTX md;

	int exp,n,i,j,k,cl;

	int is_exp,n,i,j,k,cl;



	exp=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);

	is_exp=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);

	c=s->s3->tmp.new_sym_enc;

	m=s->s3->tmp.new_hash;

	if (s->s3->tmp.new_compression == NULL)
@@ -262,9 +262,9 @@ int ssl3_change_cipher_state(SSL *s, int which) 
	p=s->s3->tmp.key_block;

	i=EVP_MD_size(m);

	cl=EVP_CIPHER_key_length(c);

	j=exp ? (cl < SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher) ?

	j=is_exp ? (cl < SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher) ?

		    cl : SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher)) : cl;

	/* Was j=(exp)?5:EVP_CIPHER_key_length(c); */

	/* Was j=(is_exp)?5:EVP_CIPHER_key_length(c); */

	k=EVP_CIPHER_iv_length(c);

	if (	(which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||

		(which == SSL3_CHANGE_CIPHER_SERVER_READ))
@@ -292,7 +292,7 @@ int ssl3_change_cipher_state(SSL *s, int which) 
		}



	memcpy(mac_secret,ms,i);

	if (exp)

	if (is_exp)

		{

		/* In here I set both the read and write key/iv to the

		 * same value since only the correct one will be used :-).

ssl/ssl_ciph.c

+3 −3
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, 
char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len)

	{

	int is_export,pkl,kl;

	char *ver,*exp;

	char *ver,*exp_str;

	char *kx,*au,*enc,*mac;

	unsigned long alg,alg2,alg_s;

	static char *format="%-23s %s Kx=%-8s Au=%-4s Enc=%-9s Mac=%-4s%s\n";
@@ -882,7 +882,7 @@ char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len) 
	is_export=SSL_C_IS_EXPORT(cipher);

	pkl=SSL_C_EXPORT_PKEYLENGTH(cipher);

	kl=SSL_C_EXPORT_KEYLENGTH(cipher);

	exp=is_export?" export":"";

	exp_str=is_export?" export":"";



	if (alg & SSL_SSLV2)

		ver="SSLv2";
@@ -983,7 +983,7 @@ char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len) 
	else if (len < 128)

		return("Buffer too small");



	BIO_snprintf(buf,len,format,cipher->name,ver,kx,au,enc,mac,exp);

	BIO_snprintf(buf,len,format,cipher->name,ver,kx,au,enc,mac,exp_str);

	return(buf);

	}