Convert ossl_ns_spki.c to opaque ASN1_STRING

botovq · botovq · commit 0941ebbda527 · 2025-12-06T17:31:09.000+01:00
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
@@ -230,13 +230,12 @@ ossl_spki_get_challenge(VALUE self)
     NETSCAPE_SPKI *spki;
 
     GetSPKI(self, spki);
-    if (spki->spkac->challenge->length <= 0) {
+    if (ASN1_STRING_length(spki->spkac->challenge) <= 0) {
         OSSL_Debug("Challenge.length <= 0?");
         return rb_str_new(0, 0);
     }
 
-    return rb_str_new((const char *)spki->spkac->challenge->data,
-                      spki->spkac->challenge->length);
+    return asn1str_to_str(spki->spkac->challenge);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -230,13 +230,12 @@ ossl_spki_get_challenge(VALUE self)`
`230`	`230`	`NETSCAPE_SPKI *spki;`
`231`	`231`
`232`	`232`	`GetSPKI(self, spki);`
`233`		`- if (spki->spkac->challenge->length <= 0) {`
	`233`	`+ if (ASN1_STRING_length(spki->spkac->challenge) <= 0) {`
`234`	`234`	`OSSL_Debug("Challenge.length <= 0?");`
`235`	`235`	`return rb_str_new(0, 0);`
`236`	`236`	`}`
`237`	`237`
`238`		`- return rb_str_new((const char *)spki->spkac->challenge->data,`
`239`		`- spki->spkac->challenge->length);`
	`238`	`+ return asn1str_to_str(spki->spkac->challenge);`
`240`	`239`	`}`
`241`	`240`
`242`	`241`	`/*`