OpenSSL: openssl/apps/ ca.c cms.c openssl/crypto/asn1/ a_type.c ...

  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:  
16-Mar-2008 21:59:10
  Branch: HEAD                             Handle:
2008031620590901

  Modified files:
    openssl/apps            ca.c cms.c
    openssl/crypto/asn1     a_type.c
    openssl/crypto/cms      cms_asn1.c
    openssl/crypto/hmac     hm_pmeth.c

  Log:
    Fix some warnings.

  Summary:
    Revision    Changes     Path
    1.158       +2  -2      openssl/apps/ca.c
    1.6         +1  -1      openssl/apps/cms.c
    1.23        +2  -1      openssl/crypto/asn1/a_type.c
    1.4         +2  -0      openssl/crypto/cms/cms_asn1.c
    1.5         +2  -1      openssl/crypto/hmac/hm_pmeth.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/apps/ca.c
 
============================================================
================
  $ cvs diff -u -r1.157 -r1.158 ca.c
  --- openssl/apps/ca.c	4 Apr 2007 14:35:56 -0000	1.157
  +++ openssl/apps/ca.c	16 Mar 2008 20:59:09 -0000	1.158
   -226,7 +226,7 
   static int do_revoke(X509 *x509, CA_DB *db, int ext, char
*extval);
   static int get_certificate_status(const char *ser_status,
CA_DB *db);
   static int do_updatedb(CA_DB *db);
  -static int check_time_format(char *str);
  +static int check_time_format(const char *str);
   char *make_revocation_str(int rev_type, char *rev_arg);
   int make_revoked(X509_REVOKED *rev, const char *str);
   int old_entry_print(BIO *bp, ASN1_OBJECT *obj,
ASN1_STRING *str);
   -2384,7 +2384,7 
   	return(1);
   	}
   
  -static int check_time_format(char *str)
  +static int check_time_format(const char *str)
   	{
   	ASN1_UTCTIME tm;
   
   .
  patch -p0 <<' .'
  Index: openssl/apps/cms.c
 
============================================================
================
  $ cvs diff -u -r1.5 -r1.6 cms.c
  --- openssl/apps/cms.c	15 Mar 2008 23:21:31 -0000	1.5
  +++ openssl/apps/cms.c	16 Mar 2008 20:59:09 -0000	1.6
   -124,7 +124,7 
   	char *engine=NULL;
   #endif
   	unsigned char *secret_key = NULL;
  -	size_t secret_keylen;
  +	size_t secret_keylen = 0;
   
   	X509_VERIFY_PARAM *vpm = NULL;
   
   .
  patch -p0 <<' .'
  Index: openssl/crypto/asn1/a_type.c
 
============================================================
================
  $ cvs diff -u -r1.22 -r1.23 a_type.c
  --- openssl/crypto/asn1/a_type.c	28 Feb 2008 13:18:25
-0000	1.22
  +++ openssl/crypto/asn1/a_type.c	16 Mar 2008 20:59:09
-0000	1.23
   -87,7 +87,8 
   	{
   	if (!value || (type == V_ASN1_BOOLEAN))
   		{
  -		ASN1_TYPE_set(a, type, (void *)value);
  +		void *p = (void *)value;
  +		ASN1_TYPE_set(a, type, p);
   		}
   	else if (type == V_ASN1_OBJECT)
   		{
   .
  patch -p0 <<' .'
  Index: openssl/crypto/cms/cms_asn1.c
 
============================================================
================
  $ cvs diff -u -r1.3 -r1.4 cms_asn1.c
  --- openssl/crypto/cms/cms_asn1.c	14 Mar 2008 00:58:42
-0000	1.3
  +++ openssl/crypto/cms/cms_asn1.c	16 Mar 2008 20:59:09
-0000	1.4
   -309,6 +309,8 
   	CMS_ContentInfo *cms;
   	if (pval)
   		cms = (CMS_ContentInfo *)*pval;
  +	else
  +		return 1;
   	switch(operation)
   		{
   
   .
  patch -p0 <<' .'
  Index: openssl/crypto/hmac/hm_pmeth.c
 
============================================================
================
  $ cvs diff -u -r1.4 -r1.5 hm_pmeth.c
  --- openssl/crypto/hmac/hm_pmeth.c	26 Oct 2007 12:06:32
-0000	1.4
  +++ openssl/crypto/hmac/hm_pmeth.c	16 Mar 2008 20:59:10
-0000	1.5
   -206,8 +206,9 
   		}
   	if (!strcmp(type, "key"))
   		{
  +		void *p = (void *)value;
   		return pkey_hmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY,
  -				-1, (void *)value);
  +				-1, p);
   		}
   	if (!strcmp(type, "hexkey"))
   		{
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org