[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: OpenSSL_0_9_7-stable: openssl/crypto/bio/ b_print.c ope...
From:       "Richard Levitte" <levitte () openssl ! org>
Date:       2003-12-27 14:24:20
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Richard Levitte
  Root:   /e/openssl/cvs                   Email:  levitte@openssl.org
  Module: openssl                          Date:   27-Dec-2003 15:24:20
  Branch: OpenSSL_0_9_7-stable             Handle: 2003122714241901

  Modified files:           (Branch: OpenSSL_0_9_7-stable)
    openssl/crypto/bio      b_print.c
    openssl/ssl             s3_enc.c

  Log:
    Change 'exp' to something else, as 'exp' is predefined by GNU C.  This
    was already done in HEAD, but not in this branch (I wonder why...).

  Summary:
    Revision    Changes     Path
    1.25.2.9    +3  -3      openssl/crypto/bio/b_print.c
    1.31.2.8    +6  -6      openssl/ssl/s3_enc.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/crypto/bio/b_print.c
  ============================================================================
  $ cvs diff -u -r1.25.2.8 -r1.25.2.9 b_print.c
  --- openssl/crypto/bio/b_print.c	11 Dec 2003 18:01:06 -0000	1.25.2.8
  +++ openssl/crypto/bio/b_print.c	27 Dec 2003 14:24:20 -0000	1.25.2.9
  @@ -576,12 +576,12 @@
   }
   
   static LDOUBLE
  -pow10(int exp)
  +pow10(int in_exp)
   {
       LDOUBLE result = 1;
  -    while (exp) {
  +    while (in_exp) {
           result *= 10;
  -        exp--;
  +        in_exp--;
       }
       return result;
   }
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/ssl/s3_enc.c
  ============================================================================
  $ cvs diff -u -r1.31.2.7 -r1.31.2.8 s3_enc.c
  --- openssl/ssl/s3_enc.c	12 Feb 2003 14:17:38 -0000	1.31.2.7
  +++ openssl/ssl/s3_enc.c	27 Dec 2003 14:24:19 -0000	1.31.2.8
  @@ -199,10 +199,10 @@
   	COMP_METHOD *comp;
   	const EVP_MD *m;
   	EVP_MD_CTX md;
  -	int exp,n,i,j,k,cl;
  +	int is_exp,n,i,j,k,cl;
   	int reuse_dd = 0;
   
  -	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)
  @@ -276,9 +276,9 @@
   	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) ?
  -		 cl : SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher)) : cl;
  -	/* Was j=(exp)?5:EVP_CIPHER_key_length(c); */
  +	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=(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))
  @@ -307,7 +307,7 @@
   
   	EVP_MD_CTX_init(&md);
   	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 :-).
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]