Commit 67ffa18c authored by Nils Larsch's avatar Nils Larsch
Browse files

make the type parameter const when ID2_OF_const() is used

parent 788e67e2

crypto/asn1/asn1.h

+1 −1
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x); 
#define ASN1_i2d_bio_of(type,i2d,out,x) \

	((int (*)(I2D_OF(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)

#define ASN1_i2d_bio_of_const(type,i2d,out,x) \

	((int (*)(I2D_OF_const(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)

	((int (*)(I2D_OF_const(type),BIO *,const type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)

int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);

int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);

int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);

crypto/pem/pem.h

+22 −8
Original line number Diff line number Diff line
@@ -230,9 +230,9 @@ return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,uns 
}



#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \

int PEM_write_##name(FILE *fp, type *x) \

int PEM_write_##name(FILE *fp, const type *x) \

{ \

return(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \

return(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \

}



#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
@@ -266,9 +266,9 @@ return(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsi 
}



#define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \

int PEM_write_bio_##name(BIO *bp, type *x) \

int PEM_write_bio_##name(BIO *bp, const type *x) \

{ \

return(((int (*)(I2D_OF_const(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \

return(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \

}



#define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
@@ -333,6 +333,9 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ 
#define DECLARE_PEM_write_fp(name, type) \

	int PEM_write_##name(FILE *fp, type *x);



#define DECLARE_PEM_write_fp_const(name, type) \

	int PEM_write_##name(FILE *fp, const type *x);



#define DECLARE_PEM_write_cb_fp(name, type) \

	int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \

	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
@@ -346,6 +349,9 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ 
#define DECLARE_PEM_write_bio(name, type) \

	int PEM_write_bio_##name(BIO *bp, type *x);



#define DECLARE_PEM_write_bio_const(name, type) \

	int PEM_write_bio_##name(BIO *bp, const type *x);



#define DECLARE_PEM_write_cb_bio(name, type) \

	int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \

	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
@@ -362,6 +368,10 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ 
	DECLARE_PEM_write_bio(name, type) \

	DECLARE_PEM_write_fp(name, type) 



#define DECLARE_PEM_write_const(name, type) \

	DECLARE_PEM_write_bio_const(name, type) \

	DECLARE_PEM_write_fp_const(name, type)



#define DECLARE_PEM_write_cb(name, type) \

	DECLARE_PEM_write_cb_bio(name, type) \

	DECLARE_PEM_write_cb_fp(name, type)
@@ -374,6 +384,10 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ 
	DECLARE_PEM_read(name, type) \

	DECLARE_PEM_write(name, type)



#define DECLARE_PEM_rw_const(name, type) \

	DECLARE_PEM_read(name, type) \

	DECLARE_PEM_write_const(name, type)



#define DECLARE_PEM_rw_cb(name, type) \

	DECLARE_PEM_read(name, type) \

	DECLARE_PEM_write_cb(name, type)
@@ -601,7 +615,7 @@ DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO) 


DECLARE_PEM_rw_cb(RSAPrivateKey, RSA)



DECLARE_PEM_rw(RSAPublicKey, RSA)

DECLARE_PEM_rw_const(RSAPublicKey, RSA)

DECLARE_PEM_rw(RSA_PUBKEY, RSA)



#endif
@@ -612,19 +626,19 @@ DECLARE_PEM_rw_cb(DSAPrivateKey, DSA) 


DECLARE_PEM_rw(DSA_PUBKEY, DSA)



DECLARE_PEM_rw(DSAparams, DSA)

DECLARE_PEM_rw_const(DSAparams, DSA)



#endif



#ifndef OPENSSL_NO_EC

DECLARE_PEM_rw(ECPKParameters, EC_GROUP)

DECLARE_PEM_rw_const(ECPKParameters, EC_GROUP)

DECLARE_PEM_rw_cb(ECPrivateKey, EC_KEY)

DECLARE_PEM_rw(EC_PUBKEY, EC_KEY)

#endif



#ifndef OPENSSL_NO_DH



DECLARE_PEM_rw(DHparams, DH)

DECLARE_PEM_rw_const(DHparams, DH)



#endif