summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509v3/v3_conf.c
diff options
context:
space:
mode:
authorjsing <>2016-12-30 15:54:49 +0000
committerjsing <>2016-12-30 15:54:49 +0000
commit34bdec04311ee3fb8f658406df37d4da910d1630 (patch)
tree853b9e5ebf0a8736f0e5ed0a4f77b796ee89ce19 /src/lib/libcrypto/x509v3/v3_conf.c
parent19f5bc5369a8920072dcf66ff2aa6e1b7cc62b85 (diff)
downloadopenbsd-34bdec04311ee3fb8f658406df37d4da910d1630.tar.gz
openbsd-34bdec04311ee3fb8f658406df37d4da910d1630.tar.bz2
openbsd-34bdec04311ee3fb8f658406df37d4da910d1630.zip
Expand ASN1_ITEM_ref and ASN1_ITEM_ptr macros - no change in generated
assembly. Of particular interest is ASN1_ITEM_ptr which does nothing and resulted in code like: if (method->it) ASN1_ITEM_free(..., ASN1_ITEM_ptr(method->it));
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_conf.c')
-rw-r--r--src/lib/libcrypto/x509v3/v3_conf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_conf.c b/src/lib/libcrypto/x509v3/v3_conf.c
index 20e156ce87..6847985913 100644
--- a/src/lib/libcrypto/x509v3/v3_conf.c
+++ b/src/lib/libcrypto/x509v3/v3_conf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_conf.c,v 1.19 2015/12/14 03:39:14 beck Exp $ */ 1/* $OpenBSD: v3_conf.c,v 1.20 2016/12/30 15:54:49 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -173,7 +173,7 @@ do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid, int crit, char *value)
173 173
174 ext = do_ext_i2d(method, ext_nid, crit, ext_struc); 174 ext = do_ext_i2d(method, ext_nid, crit, ext_struc);
175 if (method->it) 175 if (method->it)
176 ASN1_item_free(ext_struc, ASN1_ITEM_ptr(method->it)); 176 ASN1_item_free(ext_struc, method->it);
177 else 177 else
178 method->ext_free(ext_struc); 178 method->ext_free(ext_struc);
179 return ext; 179 return ext;
@@ -192,7 +192,7 @@ do_ext_i2d(const X509V3_EXT_METHOD *method, int ext_nid, int crit,
192 if (method->it) { 192 if (method->it) {
193 ext_der = NULL; 193 ext_der = NULL;
194 ext_len = ASN1_item_i2d(ext_struc, &ext_der, 194 ext_len = ASN1_item_i2d(ext_struc, &ext_der,
195 ASN1_ITEM_ptr(method->it)); 195 method->it);
196 if (ext_len < 0) 196 if (ext_len < 0)
197 goto merr; 197 goto merr;
198 } else { 198 } else {