openssl: Fix merge

ndossche · ndossche · commit c5fb035c6701 · 2026-04-04T13:24:27.000+02:00
Diffs in commit messages are applied by git, what a stupid design.
So this can introduce accidental changes like here where the original
reproducer got applied.
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -2968,9 +2968,7 @@ static zend_result php_openssl_csr_make(struct php_x509_request * req, X509_REQ
 		}
 	}
 	/* setup the version number: version 1 */
-	static int counter = 0;
-	counter++;
-	if (counter!=2&&X509_REQ_set_version(csr, 0L)) {
+	if (X509_REQ_set_version(csr, 0L)) {
 		int i, nid;
 		char *type;
 		CONF_VALUE *v;

Original file line number	Diff line number	Diff line change
`@@ -2968,9 +2968,7 @@ static zend_result php_openssl_csr_make(struct php_x509_request * req, X509_REQ`
`2968`	`2968`	`}`
`2969`	`2969`	`}`
`2970`	`2970`	`/* setup the version number: version 1 */`
`2971`		`- static int counter = 0;`
`2972`		`- counter++;`
`2973`		`- if (counter!=2&&X509_REQ_set_version(csr, 0L)) {`
	`2971`	`+ if (X509_REQ_set_version(csr, 0L)) {`
`2974`	`2972`	`int i, nid;`
`2975`	`2973`	`char *type;`
`2976`	`2974`	`CONF_VALUE *v;`