OpenSSL: openssl/crypto/ec/ ec_pmeth.c openssl/crypto/pkcs7/ pk7...

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
20-Jul-2006 18:56:47
  Branch: HEAD                             Handle:
2006072017564601

  Modified files:
    openssl/crypto/ec       ec_pmeth.c
    openssl/crypto/pkcs7    pk7_doit.c
    openssl/crypto/rsa      rsa_pmeth.c
    openssl/crypto/x509     x509.h

  Log:
    Use correct pointer types for various functions.

  Summary:
    Revision    Changes     Path
    1.5         +2  -2      openssl/crypto/ec/ec_pmeth.c
    1.73        +1  -1      openssl/crypto/pkcs7/pk7_doit.c
    1.27        +1  -1      openssl/crypto/rsa/rsa_pmeth.c
    1.143       +1  -1      openssl/crypto/x509/x509.h
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/ec/ec_pmeth.c
 
============================================================
================
  $ cvs diff -u -r1.4 -r1.5 ec_pmeth.c
  --- openssl/crypto/ec/ec_pmeth.c	10 Jul 2006 18:36:52
-0000	1.4
  +++ openssl/crypto/ec/ec_pmeth.c	20 Jul 2006 16:56:46
-0000	1.5
   -120,7 +120,7 
   					const unsigned char *tbs, size_t tbslen)
   	{
   	int ret, type;
  -	size_t sltmp;
  +	unsigned int sltmp;
   	EC_PKEY_CTX *dctx = ctx->data;
   	EC_KEY *ec = ctx->pkey->pkey.ec;
   
   -145,7 +145,7 
   
   	if (ret < 0)
   		return ret;
  -	*siglen = sltmp;
  +	*siglen = (size_t)sltmp;
   	return 1;
   	}
   
   .
  patch -p0 <<' .'
  Index: openssl/crypto/pkcs7/pk7_doit.c
 
============================================================
================
  $ cvs diff -u -r1.72 -r1.73 pk7_doit.c
  --- openssl/crypto/pkcs7/pk7_doit.c	10 Jul 2006 18:36:53
-0000	1.72
  +++ openssl/crypto/pkcs7/pk7_doit.c	20 Jul 2006 16:56:46
-0000	1.73
   -829,7 +829,7 
   	EVP_PKEY_CTX *pctx;
   	unsigned char *abuf = NULL;
   	int alen;
  -	unsigned int siglen;
  +	size_t siglen;
   	const EVP_MD *md = NULL;
   
   	md =
EVP_get_digestbyobj(si->digest_alg->algorithm);
   .
  patch -p0 <<' .'
  Index: openssl/crypto/rsa/rsa_pmeth.c
 
============================================================
================
  $ cvs diff -u -r1.26 -r1.27 rsa_pmeth.c
  --- openssl/crypto/rsa/rsa_pmeth.c	10 Jul 2006 18:36:55
-0000	1.26
  +++ openssl/crypto/rsa/rsa_pmeth.c	20 Jul 2006 16:56:47
-0000	1.27
   -245,7 +245,7 
   			}
   		else if (rctx->pad_mode == RSA_PKCS1_PADDING)
   			{
  -			unsigned int sltmp;
  +			size_t sltmp;
   			ret = int_rsa_verify(EVP_MD_type(rctx->md),
   						NULL, 0, rout, &sltmp,
   					sig, siglen, ctx->pkey->pkey.rsa);
   .
  patch -p0 <<' .'
  Index: openssl/crypto/x509/x509.h
 
============================================================
================
  $ cvs diff -u -r1.142 -r1.143 x509.h
  --- openssl/crypto/x509/x509.h	18 Jul 2006 12:36:18
-0000	1.142
  +++ openssl/crypto/x509/x509.h	20 Jul 2006 16:56:47
-0000	1.143
   -189,7 +189,7 
   #else
   	char *bytes;
   #endif
  -	unsigned long hash; /* Keep the hash around for lookups
*/
  +/*	unsigned long hash; Keep the hash around for lookups
*/
   	unsigned char *canon_enc;
   	int canon_enclen;
   	} /* X509_NAME */;
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org