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

Get rid of ASN1_ITEM_FUNCTIONS dummy function 

prototype hack. This unfortunately means that
every ASN1_*_END construct cannot have a
trailing ;
parent 61fca8b6

crypto/asn1/asn1t.h

+9 −10
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ extern "C" { 
	OPENSSL_GLOBAL const ASN1_ITEM itname##_it = {



#define ASN1_ITEM_end(itname) \

		}

		};



#else
@@ -104,8 +104,7 @@ extern "C" { 
#define ASN1_ITEM_end(itname) \

		}; \

	return &local_it; \

	}\

	void dummy_function(void)

	}



#endif
@@ -134,7 +133,7 @@ extern "C" { 
 *

 * 	ASN1_SEQUENCE(stname) = {

 * 		... SEQUENCE components ...

 * 	} ASN1_SEQUENCE_END(stname);

 * 	} ASN1_SEQUENCE_END(stname)

 *

 * 	This will produce an ASN1_ITEM called stname_it

 *	for a structure called stname.
@@ -144,7 +143,7 @@ extern "C" { 
 *

 * 	ASN1_SEQUENCE(itname) = {

 * 		... SEQUENCE components ...

 * 	} ASN1_SEQUENCE_END_name(stname, itname);

 * 	} ASN1_SEQUENCE_END_name(stname, itname)

 *

 *	This will create an item called itname_it using

 *	a structure called stname.
@@ -206,7 +205,7 @@ extern "C" { 
 *

 * 	ASN1_CHOICE(chname) = {

 * 		... CHOICE options ...

 * 	ASN1_CHOICE_END(chname);

 * 	ASN1_CHOICE_END(chname)

 *

 * 	This will produce an ASN1_ITEM called chname_it

 *	for a structure called chname. The structure
@@ -695,13 +694,13 @@ typedef struct ASN1_AUX_st { 
#define IMPLEMENT_ASN1_TYPE_ex(itname, vname, ex) \

				ASN1_ITEM_start(itname) \

					ASN1_ITYPE_PRIMITIVE, V_##vname, NULL, 0, NULL, ex, #itname \

				ASN1_ITEM_end(itname);

				ASN1_ITEM_end(itname)



/* Macro to implement a multi string type */

#define IMPLEMENT_ASN1_MSTRING(itname, mask) \

				ASN1_ITEM_start(itname) \

					ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname \

				ASN1_ITEM_end(itname);

				ASN1_ITEM_end(itname)



/* Macro to implement an ASN1_ITEM in terms of old style funcs */
@@ -722,7 +721,7 @@ typedef struct ASN1_AUX_st { 
		&sname##_ff, \

		0, \

		#sname \

	ASN1_ITEM_end(sname);

	ASN1_ITEM_end(sname)



#define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \

	ASN1_ITEM_start(sname) \
@@ -733,7 +732,7 @@ typedef struct ASN1_AUX_st { 
		&fptrs, \

		0, \

		#sname \

	ASN1_ITEM_end(sname);

	ASN1_ITEM_end(sname)



/* Macro to implement standard functions in terms of ASN1_ITEM structures */

crypto/asn1/n_pkey.c

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ typedef struct netscape_encrypted_pkey_st 
ASN1_BROKEN_SEQUENCE(NETSCAPE_ENCRYPTED_PKEY) = {

	ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, os, ASN1_OCTET_STRING),

	ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, enckey, X509_SIG)

} ASN1_BROKEN_SEQUENCE_END(NETSCAPE_ENCRYPTED_PKEY);

} ASN1_BROKEN_SEQUENCE_END(NETSCAPE_ENCRYPTED_PKEY)



IMPLEMENT_ASN1_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY)
@@ -98,7 +98,7 @@ ASN1_SEQUENCE(NETSCAPE_PKEY) = { 
	ASN1_SIMPLE(NETSCAPE_PKEY, version, LONG),

	ASN1_SIMPLE(NETSCAPE_PKEY, algor, X509_ALGOR),

	ASN1_SIMPLE(NETSCAPE_PKEY, private_key, ASN1_OCTET_STRING)

} ASN1_SEQUENCE_END(NETSCAPE_PKEY);

} ASN1_SEQUENCE_END(NETSCAPE_PKEY)



IMPLEMENT_ASN1_FUNCTIONS_const(NETSCAPE_PKEY)

crypto/asn1/nsseq.c

+1 −1
Original line number Diff line number Diff line
@@ -77,6 +77,6 @@ static int nsseq_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) 
ASN1_SEQUENCE_cb(NETSCAPE_CERT_SEQUENCE, nsseq_cb) = {

	ASN1_SIMPLE(NETSCAPE_CERT_SEQUENCE, type, ASN1_OBJECT),

	ASN1_EXP_SEQUENCE_OF_OPT(NETSCAPE_CERT_SEQUENCE, certs, X509, 0)

} ASN1_SEQUENCE_END_cb(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE);

} ASN1_SEQUENCE_END_cb(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)



IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_CERT_SEQUENCE)

crypto/asn1/p5_pbe.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
ASN1_SEQUENCE(PBEPARAM) = {

	ASN1_SIMPLE(PBEPARAM, salt, ASN1_OCTET_STRING),

	ASN1_SIMPLE(PBEPARAM, iter, ASN1_INTEGER)

} ASN1_SEQUENCE_END(PBEPARAM);

} ASN1_SEQUENCE_END(PBEPARAM)



IMPLEMENT_ASN1_FUNCTIONS(PBEPARAM)

crypto/asn1/p5_pbev2.c

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
ASN1_SEQUENCE(PBE2PARAM) = {

	ASN1_SIMPLE(PBE2PARAM, keyfunc, X509_ALGOR),

	ASN1_SIMPLE(PBE2PARAM, encryption, X509_ALGOR)

} ASN1_SEQUENCE_END(PBE2PARAM);

} ASN1_SEQUENCE_END(PBE2PARAM)



IMPLEMENT_ASN1_FUNCTIONS(PBE2PARAM)
@@ -76,7 +76,7 @@ ASN1_SEQUENCE(PBKDF2PARAM) = { 
	ASN1_SIMPLE(PBKDF2PARAM, iter, ASN1_INTEGER),

	ASN1_OPT(PBKDF2PARAM, keylength, ASN1_INTEGER),

	ASN1_OPT(PBKDF2PARAM, prf, X509_ALGOR)

} ASN1_SEQUENCE_END(PBKDF2PARAM);

} ASN1_SEQUENCE_END(PBKDF2PARAM)



IMPLEMENT_ASN1_FUNCTIONS(PBKDF2PARAM)