Commit c5fb035c670 for php.net
commit c5fb035c6701400cc284e7b6ebf66fa678133848
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date: Sat Apr 4 13:24:24 2026 +0200
openssl: Fix merge
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
index b3e1201854a..8fc830b756d 100644
--- 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;