summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFdaSilvaYY <fdasilvayy@gmail.com>2016-05-14 23:03:22 +0200
committerRich Salz <rsalz@openssl.org>2016-06-05 03:30:41 +0200
commit13f74c66ce83cc554ed29f88706a3176a1788f45 (patch)
tree0cd9ea30a3270339160e27855a65c6773cf9a386 /include
parentConstify s2i_ASN1_INTEGER (diff)
downloadopenssl-13f74c66ce83cc554ed29f88706a3176a1788f45.tar.xz
openssl-13f74c66ce83cc554ed29f88706a3176a1788f45.zip
Constify s2i_ASN1_IA5STRING
Return directly NULL after ASN1_STRING_set, as it already has set an error code. 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)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/x509v3.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h
index a1274afe4f..36a437aef8 100644
--- a/include/openssl/x509v3.h
+++ b/include/openssl/x509v3.h
@@ -481,7 +481,7 @@ STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
STACK_OF(CONF_VALUE) *extlist);
char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5);
ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, char *str);
+ X509V3_CTX *ctx, const char *str);
STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
GENERAL_NAME *gen,