diff options
Diffstat (limited to 'ext/openssl/ossl_x509attr.c')
| -rw-r--r-- | ext/openssl/ossl_x509attr.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c index 970a91eb85..7cd3fe6dfd 100644 --- a/ext/openssl/ossl_x509attr.c +++ b/ext/openssl/ossl_x509attr.c @@ -178,14 +178,6 @@ ossl_x509attr_get_oid(VALUE self) return ret; } -#if defined(HAVE_ST_X509_ATTRIBUTE_SINGLE) || defined(HAVE_ST_SINGLE) -# define OSSL_X509ATTR_IS_SINGLE(attr) ((attr)->single) -# define OSSL_X509ATTR_SET_SINGLE(attr) ((attr)->single = 1) -#else -# define OSSL_X509ATTR_IS_SINGLE(attr) (!(attr)->value.set) -# define OSSL_X509ATTR_SET_SINGLE(attr) ((attr)->value.set = 0) -#endif - /* * call-seq: * attr.value = asn1 => asn1 @@ -205,10 +197,10 @@ ossl_x509attr_set_value(VALUE self, VALUE value) } GetX509Attr(self, attr); if(attr->value.set){ - if(OSSL_X509ATTR_IS_SINGLE(attr)) ASN1_TYPE_free(attr->value.single); + if(attr->single) ASN1_TYPE_free(attr->value.single); else sk_ASN1_TYPE_free(attr->value.set); } - OSSL_X509ATTR_SET_SINGLE(attr); + attr->single = 1; attr->value.single = a1type; return value; @@ -228,7 +220,7 @@ ossl_x509attr_get_value(VALUE self) GetX509Attr(self, attr); if(attr->value.ptr == NULL) return Qnil; - if(OSSL_X509ATTR_IS_SINGLE(attr)){ + if(attr->single){ length = i2d_ASN1_TYPE(attr->value.single, NULL); str = rb_str_new(0, length); p = (unsigned char *)RSTRING_PTR(str); |