Merge pull request #1035 from ndossche/clesss-11

rhenium · web-flow · commit 0e2504301cfc · 2026-04-20T19:03:34.000+09:00
pkcs7: fix error check of PKCS7_RECIP_INFO_set()
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
@@ -1055,7 +1055,7 @@ ossl_pkcs7ri_initialize(VALUE self, VALUE cert)
 
     x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
     GetPKCS7ri(self, p7ri);
-    if (!PKCS7_RECIP_INFO_set(p7ri, x509)) {
+    if (PKCS7_RECIP_INFO_set(p7ri, x509) <= 0) {
         ossl_raise(ePKCS7Error, NULL);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1055,7 +1055,7 @@ ossl_pkcs7ri_initialize(VALUE self, VALUE cert)`
`1055`	`1055`
`1056`	`1056`	`x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */`
`1057`	`1057`	`GetPKCS7ri(self, p7ri);`
`1058`		`- if (!PKCS7_RECIP_INFO_set(p7ri, x509)) {`
	`1058`	`+ if (PKCS7_RECIP_INFO_set(p7ri, x509) <= 0) {`
`1059`	`1059`	`ossl_raise(ePKCS7Error, NULL);`
`1060`	`1060`	`}`
`1061`	`1061`