Commit 284ef5f3 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make NEG_PUBKEY_BUG on by default. 

ASN1_TIME fixes.

New function c2i_ASN1_OBJECT().
parent 47ff5de8

CHANGES

+17 −0
Original line number Diff line number Diff line
@@ -4,6 +4,23 @@ 


 Changes between 0.9.5a and 0.9.6  [xx XXX 2000]



  *) Various fixes to use ASN1_TIME instead of ASN1_UTCTIME.

     Also change the functions X509_cmp_current_time() and

     X509_gmtime_adj() work with an ASN1_TIME structure,

     this will enable certificates using GeneralizedTime in validity

     dates to be checked.

     [Steve Henson]



  *) Make the NEG_PUBKEY_BUG code (which tolerates invalid

     negative public key encodings) on by default,

     NO_NEG_PUBKEY_BUG can be set to disable it.

     [Steve Henson]



  *) New function c2i_ASN1_OBJECT() which acts on ASN1_OBJECT

     content octets. An i2c_ASN1_OBJECT is unnecessary because

     the encoding can be trivially obtained from the structure.

     [Steve Henson]



  *) crypto/err.c locking bugfix: Use write locks (CRYPTO_w_[un]lock),

     not read locks (CRYPTO_r_[un]lock).

     [Bodo Moeller]

crypto/asn1/a_object.c

+28 −13
Original line number Diff line number Diff line
@@ -191,23 +191,12 @@ int i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a) 
ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, unsigned char **pp,

	     long length)

{

	ASN1_OBJECT *ret=NULL;

	unsigned char *p;

	long len;

	int tag,xclass;

	int inf,i;



	/* only the ASN1_OBJECTs from the 'table' will have values

	 * for ->sn or ->ln */

	if ((a == NULL) || ((*a) == NULL) ||

		!((*a)->flags & ASN1_OBJECT_FLAG_DYNAMIC))

		{

		if ((ret=ASN1_OBJECT_new()) == NULL) return(NULL);

		}

	else	ret=(*a);



	ASN1_OBJECT *ret = NULL;

	p= *pp;



	inf=ASN1_get_object(&p,&len,&tag,&xclass,length);

	if (inf & 0x80)

		{
@@ -220,6 +209,32 @@ ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, unsigned char **pp, 
		i=ASN1_R_EXPECTING_AN_OBJECT;

		goto err;

		}

	ret = c2i_ASN1_OBJECT(a, &p, len);

	if(ret) *pp = p;

	return ret;

err:

	ASN1err(ASN1_F_D2I_ASN1_OBJECT,i);

	if ((ret != NULL) && ((a == NULL) || (*a != ret)))

		ASN1_OBJECT_free(ret);

	return(NULL);

}

ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, unsigned char **pp,

	     long len)

	{

	ASN1_OBJECT *ret=NULL;

	unsigned char *p;

	int i;



	/* only the ASN1_OBJECTs from the 'table' will have values

	 * for ->sn or ->ln */

	if ((a == NULL) || ((*a) == NULL) ||

		!((*a)->flags & ASN1_OBJECT_FLAG_DYNAMIC))

		{

		if ((ret=ASN1_OBJECT_new()) == NULL) return(NULL);

		}

	else	ret=(*a);



	p= *pp;

	if ((ret->data == NULL) || (ret->length < len))

		{

		if (ret->data != NULL) OPENSSL_free(ret->data);

crypto/asn1/asn1.h

+5 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ DECLARE_STACK_OF(ASN1_STRING_TABLE) 
#define ASN1_BMPSTRING		ASN1_STRING

#define ASN1_VISIBLESTRING	ASN1_STRING

#define ASN1_UTF8STRING		ASN1_STRING

#define ASN1_BOOLEAN		int

#else

typedef struct asn1_string_st ASN1_INTEGER;

typedef struct asn1_string_st ASN1_ENUMERATED;
@@ -253,6 +254,7 @@ typedef struct asn1_string_st ASN1_TIME; 
typedef struct asn1_string_st ASN1_GENERALIZEDTIME;

typedef struct asn1_string_st ASN1_VISIBLESTRING;

typedef struct asn1_string_st ASN1_UTF8STRING;

typedef int ASN1_BOOLEAN;

#endif



typedef int ASN1_NULL;
@@ -265,6 +267,7 @@ typedef struct asn1_type_st 
	int type;

	union	{

		char *ptr;

		ASN1_BOOLEAN		boolean;

		ASN1_STRING *		asn1_string;

		ASN1_OBJECT *		object;

		ASN1_INTEGER *		integer;
@@ -506,6 +509,8 @@ void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value); 
ASN1_OBJECT *	ASN1_OBJECT_new(void );

void		ASN1_OBJECT_free(ASN1_OBJECT *a);

int		i2d_ASN1_OBJECT(ASN1_OBJECT *a,unsigned char **pp);

ASN1_OBJECT *	c2i_ASN1_OBJECT(ASN1_OBJECT **a,unsigned char **pp,

			long length);

ASN1_OBJECT *	d2i_ASN1_OBJECT(ASN1_OBJECT **a,unsigned char **pp,

			long length);

crypto/asn1/d2i_dsap.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
#include <openssl/objects.h>

#include <openssl/asn1_mac.h>



#ifdef NEG_PUBKEY_BUG

#ifndef NO_NEG_PUBKEY_BUG

#define d2i_ASN1_INTEGER d2i_ASN1_UINTEGER

#endif

crypto/asn1/d2i_r_pu.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
#include <openssl/objects.h>

#include <openssl/asn1_mac.h>



#ifdef NEG_PUBKEY_BUG

#ifndef NO_NEG_PUBKEY_BUG

#define d2i_ASN1_INTEGER d2i_ASN1_UINTEGER

#endif