Skip to content

Commit 9bc8c24

Browse files
committed
Fix discarding const qualifier with OpenSSL master branch
OpenSSL's master branch is going to be OpenSSL 4.0. These functions return const pointers: - PKCS7_get_signed_attribute() - X509_ATTRIBUTE_get0_object() - X509_ATTRIBUTE_get0_type()
1 parent f9429bd commit 9bc8c24

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

ext/openssl/ossl_pkcs7.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ static VALUE
10101010
ossl_pkcs7si_get_signed_time(VALUE self)
10111011
{
10121012
PKCS7_SIGNER_INFO *p7si;
1013-
ASN1_TYPE *asn1obj;
1013+
const ASN1_TYPE *asn1obj;
10141014

10151015
GetPKCS7si(self, p7si);
10161016

ext/openssl/ossl_x509attr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ ossl_x509attr_set_value(VALUE self, VALUE value)
196196
ossl_raise(eX509AttrError, "attribute value must be ASN1::Set");
197197

198198
if (X509_ATTRIBUTE_count(attr)) { /* populated, reset first */
199-
ASN1_OBJECT *obj = X509_ATTRIBUTE_get0_object(attr);
199+
const ASN1_OBJECT *obj = X509_ATTRIBUTE_get0_object(attr);
200200
X509_ATTRIBUTE *new_attr = X509_ATTRIBUTE_create_by_OBJ(NULL, obj, 0, NULL, -1);
201201
if (!new_attr) {
202202
sk_ASN1_TYPE_pop_free(sk, ASN1_TYPE_free);
@@ -240,7 +240,7 @@ ossl_x509attr_get_value(VALUE self)
240240

241241
count = X509_ATTRIBUTE_count(attr);
242242
for (i = 0; i < count; i++)
243-
sk_ASN1_TYPE_push(sk, X509_ATTRIBUTE_get0_type(attr, i));
243+
sk_ASN1_TYPE_push(sk, (ASN1_TYPE *)X509_ATTRIBUTE_get0_type(attr, i));
244244

245245
if ((len = i2d_ASN1_SET_ANY(sk, NULL)) <= 0) {
246246
sk_ASN1_TYPE_free(sk);

0 commit comments

Comments
 (0)