diff options
author | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-25 08:50:03 +0000 |
---|---|---|
committer | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-25 08:50:03 +0000 |
commit | 49c24fd8def2c413885b08ef07fc5aab3a9b03e2 (patch) | |
tree | 9a364fd7aab34a08b49427759776060aa4b3afbf /ext/openssl/ossl_x509attr.c | |
parent | c9c4cd7b1e7f233d121a090005d2705a72697864 (diff) | |
download | ruby-49c24fd8def2c413885b08ef07fc5aab3a9b03e2.tar.gz |
openssl: drop OpenSSL 0.9.6/0.9.7 support
* ext/openssl, test/openssl: Drop OpenSSL < 0.9.8 support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
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); |