From: FdaSilvaYY Date: Sat, 14 May 2016 21:18:49 +0000 (+0200) Subject: Constify ASN1_generate_nconf X-Git-Tag: OpenSSL_1_1_0-pre6~548 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=009951d24da57089072949f84acc5c906b15fe71;p=oweals%2Fopenssl.git Constify ASN1_generate_nconf Reviewed-by: Matt Caswell Reviewed-by: Kurt Roeckx Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1074) --- diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c index 2c7eb6a08e..493a693aa3 100644 --- a/crypto/asn1/asn1_gen.c +++ b/crypto/asn1/asn1_gen.c @@ -75,7 +75,7 @@ static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf, static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype); static int asn1_str2tag(const char *tagstr, int len); -ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf) +ASN1_TYPE *ASN1_generate_nconf(const char *str, CONF *nconf) { X509V3_CTX cnf; diff --git a/doc/crypto/ASN1_generate_nconf.pod b/doc/crypto/ASN1_generate_nconf.pod index 9ae98acf42..92f624fa24 100644 --- a/doc/crypto/ASN1_generate_nconf.pod +++ b/doc/crypto/ASN1_generate_nconf.pod @@ -8,7 +8,7 @@ ASN1_generate_nconf, ASN1_generate_v3 - ASN1 generation functions #include - ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf); + ASN1_TYPE *ASN1_generate_nconf(const char *str, CONF *nconf); ASN1_TYPE *ASN1_generate_v3(const char *str, X509V3_CTX *cnf); =head1 DESCRIPTION diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h index 8f833a1aa4..7e2f72039f 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -798,7 +798,7 @@ int ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out, void ASN1_add_oid_module(void); void ASN1_add_stable_module(void); -ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf); +ASN1_TYPE *ASN1_generate_nconf(const char *str, CONF *nconf); ASN1_TYPE *ASN1_generate_v3(const char *str, X509V3_CTX *cnf); int ASN1_str2mask(const char *str, unsigned long *pmask);