From: Frederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk>
Date: Wed, 22 Apr 2026 07:37:25 +0000 (+0200)
Subject: Removes duplicated __owur.
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d31fbbeded371bf30695727841b2e8da855c7ffa;p=thirdparty%2Fopenssl.git

Removes duplicated __owur.

Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Fri Apr 24 08:09:10 2026
(Merged from https://github.com/openssl/openssl/pull/30933)
---

diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
index cba2cd80ba6..f92937e9515 100644
--- a/include/openssl/ssl.h.in
+++ b/include/openssl/ssl.h.in
@@ -2556,7 +2556,7 @@ SSL_as_poll_descriptor(SSL *s)
 __owur int SSL_session_reused(const SSL *s);
 __owur int SSL_is_server(const SSL *s);
 
-__owur __owur SSL_CONF_CTX *SSL_CONF_CTX_new(void);
+__owur SSL_CONF_CTX *SSL_CONF_CTX_new(void);
 int SSL_CONF_CTX_finish(SSL_CONF_CTX *cctx);
 void SSL_CONF_CTX_free(SSL_CONF_CTX *cctx);
 unsigned int SSL_CONF_CTX_set_flags(SSL_CONF_CTX *cctx, unsigned int flags);
diff --git a/providers/implementations/include/prov/ml_dsa_codecs.h b/providers/implementations/include/prov/ml_dsa_codecs.h
index dd42ac13c00..f440dc3bc1b 100644
--- a/providers/implementations/include/prov/ml_dsa_codecs.h
+++ b/providers/implementations/include/prov/ml_dsa_codecs.h
@@ -24,13 +24,9 @@ __owur ML_DSA_KEY *ossl_ml_dsa_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
     int evp_type, PROV_CTX *provctx,
     const char *propq);
 __owur int ossl_ml_dsa_key_to_text(BIO *out, const ML_DSA_KEY *key, int selection);
-__owur
-    __owur int
-    ossl_ml_dsa_i2d_pubkey(const ML_DSA_KEY *key, unsigned char **out);
-__owur
-    __owur int
-    ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, unsigned char **out,
-        PROV_CTX *provctx, const char *formats);
+__owur int ossl_ml_dsa_i2d_pubkey(const ML_DSA_KEY *key, unsigned char **out);
+__owur int ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, unsigned char **out,
+    PROV_CTX *provctx, const char *formats);
 
 #endif /* OPENSSL_NO_ML_DSA */
 #endif /* PROV_ML_DSA_CODECS_H */
diff --git a/providers/implementations/include/prov/ml_kem_codecs.h b/providers/implementations/include/prov/ml_kem_codecs.h
index a05d9b2dd16..ad72c9f5d78 100644
--- a/providers/implementations/include/prov/ml_kem_codecs.h
+++ b/providers/implementations/include/prov/ml_kem_codecs.h
@@ -24,13 +24,9 @@ __owur ML_KEM_KEY *ossl_ml_kem_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
     int evp_type, PROV_CTX *provctx,
     const char *propq);
 __owur int ossl_ml_kem_key_to_text(BIO *out, const ML_KEM_KEY *key, int selection);
-__owur
-    __owur int
-    ossl_ml_kem_i2d_pubkey(const ML_KEM_KEY *key, unsigned char **out);
-__owur
-    __owur int
-    ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, unsigned char **out,
-        PROV_CTX *provctx, const char *formats);
+__owur int ossl_ml_kem_i2d_pubkey(const ML_KEM_KEY *key, unsigned char **out);
+__owur int ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, unsigned char **out,
+    PROV_CTX *provctx, const char *formats);
 
 #endif /* OPENSSL_NO_ML_KEM */
 #endif /* PROV_ML_KEM_CODECS_H */