]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
X509 returned by X509_REQ_to_X509() should not be (const ...)
authorAlexandr Nedvedicky <sashan@openssl.org>
Mon, 2 Mar 2026 13:50:10 +0000 (14:50 +0100)
committerTomas Mraz <tomas@openssl.org>
Tue, 3 Mar 2026 18:26:19 +0000 (19:26 +0100)
Fixes: 37436ba6977e "Constify X509_to_X509_REQ and X509_REQ_to_X509"
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
MergeDate: Tue Mar  3 18:26:24 2026
(Merged from https://github.com/openssl/openssl/pull/30229)

crypto/x509/x509_r2x.c
include/openssl/x509.h.in

index 37a42b3cf8d2d8124577518a1dcb6d1df950a589..e59f86471f0dcbec0e4b90f92780ef9df61a8f8c 100644 (file)
@@ -17,7 +17,7 @@
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 
-const X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
+X509 *X509_REQ_to_X509(const X509_REQ *r, int days, EVP_PKEY *pkey)
 {
     X509 *ret = NULL;
     X509_CINF *xi = NULL;
@@ -58,7 +58,7 @@ const X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
 
     if (!X509_sign(ret, pkey, EVP_md5()))
         goto err;
-    return (const X509 *)ret;
+    return ret;
 
 err:
     X509_free(ret);
index 31ddf3ebec7c9782973e1083596d3bf7a7dc045d..b5a104a3aa5dcd89c334acac550c6db12e0ea246 100644 (file)
@@ -517,7 +517,7 @@ const char *X509_get_default_cert_file_env(void);
 const char *X509_get_default_private_dir(void);
 
 X509_REQ *X509_to_X509_REQ(const X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
-const X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey);
+X509 *X509_REQ_to_X509(const X509_REQ *r, int days, EVP_PKEY *pkey);
 
 DECLARE_ASN1_FUNCTIONS(X509_ALGOR)
 DECLARE_ASN1_ENCODE_FUNCTIONS(X509_ALGORS, X509_ALGORS, X509_ALGORS)