diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-05-14 22:23:55 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-06-04 21:30:41 -0400 |
| commit | 12eaf3b8496f5e3578414202f7d26dc5cec2ee9a (patch) | |
| tree | 7a78cc31d8f135bbd8baa2bf8646e547e11b7755 | |
| parent | 13f74c66ce83cc554ed29f88706a3176a1788f45 (diff) | |
| download | openssl-12eaf3b8496f5e3578414202f7d26dc5cec2ee9a.tar.gz | |
Constify ASN1_generate_v3
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1074)
| -rw-r--r-- | crypto/asn1/asn1_gen.c | 6 | ||||
| -rw-r--r-- | doc/crypto/ASN1_generate_nconf.pod | 2 | ||||
| -rw-r--r-- | include/openssl/asn1.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c index 0ad886c499..2c7eb6a08e 100644 --- a/crypto/asn1/asn1_gen.c +++ b/crypto/asn1/asn1_gen.c @@ -62,7 +62,7 @@ typedef struct { int exp_count; } tag_exp_arg; -static ASN1_TYPE *generate_v3(char *str, X509V3_CTX *cnf, int depth, +static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth, int *perr); static int bitstr_cb(const char *elem, int len, void *bitstr); static int asn1_cb(const char *elem, int len, void *bitstr); @@ -86,7 +86,7 @@ ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf) return ASN1_generate_v3(str, &cnf); } -ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf) +ASN1_TYPE *ASN1_generate_v3(const char *str, X509V3_CTX *cnf) { int err = 0; ASN1_TYPE *ret = generate_v3(str, cnf, 0, &err); @@ -95,7 +95,7 @@ ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf) return ret; } -static ASN1_TYPE *generate_v3(char *str, X509V3_CTX *cnf, int depth, +static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth, int *perr) { ASN1_TYPE *ret; diff --git a/doc/crypto/ASN1_generate_nconf.pod b/doc/crypto/ASN1_generate_nconf.pod index d2e8a173a1..9ae98acf42 100644 --- a/doc/crypto/ASN1_generate_nconf.pod +++ b/doc/crypto/ASN1_generate_nconf.pod @@ -9,7 +9,7 @@ ASN1_generate_nconf, ASN1_generate_v3 - ASN1 generation functions #include <openssl/asn1.h> ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf); - ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf); + 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 a5961264a7..8f833a1aa4 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -799,7 +799,7 @@ 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_v3(char *str, X509V3_CTX *cnf); +ASN1_TYPE *ASN1_generate_v3(const char *str, X509V3_CTX *cnf); int ASN1_str2mask(const char *str, unsigned long *pmask); /* ASN1 Print flags */ |