Commit 3f82746fb9 for openssl.org
commit 3f82746fb9e403477298b003adfc1e3f80cebbf7
Author: Eugene Syromiatnikov <esyr@openssl.org>
Date: Thu Jul 30 08:43:50 2026 +0200
include/openssl: harmonise formatting of OSSL_DEPRECATEDIN_._._FOR messages
Use lower case (as it is a continuation of a sentence after
a semicolon), no leading space (as it is added
by OSSL_DEPRECATED_FOR()), and no terminating period (it is a message,
also, it mirrors OSSL_DEPRECATED() formatting). Also, shorten some
messages for brevity.
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Bob Beck <beck@openssl.org>
Merge-date: Wed Aug 19 10:35:54 2026
Merged-from: https://github.com/openssl/openssl/pull/32119
diff --git a/include/openssl/asn1.h.in b/include/openssl/asn1.h.in
index a6f905b073..4962a203c9 100644
--- a/include/openssl/asn1.h.in
+++ b/include/openssl/asn1.h.in
@@ -541,9 +541,9 @@ int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b);
* make its data void *
*/
#if !defined(OPENSSL_NO_DEPRECATED_4_1)
-OSSL_DEPRECATEDIN_4_1_FOR(" Use ASN1_STRING_set1_data() or ASN1_STRING_set1_string() instead.")
+OSSL_DEPRECATEDIN_4_1_FOR("use ASN1_STRING_set1_data() or ASN1_STRING_set1_string()")
int ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);
-OSSL_DEPRECATEDIN_4_1_FOR(" Use ASN1_STRING_get_length() instead.")
+OSSL_DEPRECATEDIN_4_1_FOR("use ASN1_STRING_get_length()")
int ASN1_STRING_length(const ASN1_STRING *x);
#endif /* !defined(OPENSSL_NO_DEPRECATED_4_1) */
void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len);
diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h
index d49b22373e..aaabd1ae45 100644
--- a/include/openssl/kdf.h
+++ b/include/openssl/kdf.h
@@ -41,7 +41,7 @@ const EVP_KDF *EVP_KDF_CTX_get0_kdf(const EVP_KDF_CTX *ctx);
EVP_KDF *EVP_KDF_CTX_get1_kdf(const EVP_KDF_CTX *ctx);
#if !defined(OPENSSL_NO_DEPRECATED_4_1)
-OSSL_DEPRECATEDIN_4_1_FOR("Use EVP_KDF_CTX_get0_kdf")
+OSSL_DEPRECATEDIN_4_1_FOR("use EVP_KDF_CTX_get0_kdf()")
const EVP_KDF *EVP_KDF_CTX_kdf(const EVP_KDF_CTX *ctx);
#endif /* !OPENSSL_NO_DEPRECATED_4_1 */
diff --git a/include/openssl/ts.h b/include/openssl/ts.h
index 93c7dce4b6..ac6b988041 100644
--- a/include/openssl/ts.h
+++ b/include/openssl/ts.h
@@ -418,19 +418,19 @@ void TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx);
int TS_VERIFY_CTX_set_flags(TS_VERIFY_CTX *ctx, int f);
int TS_VERIFY_CTX_add_flags(TS_VERIFY_CTX *ctx, int f);
#ifndef OPENSSL_NO_DEPRECATED_3_4
-OSSL_DEPRECATEDIN_3_4_FOR("Unclear semantics, replace with TS_VERIFY_CTX_set0_data().")
+OSSL_DEPRECATEDIN_3_4_FOR("unclear semantics, replace with TS_VERIFY_CTX_set0_data()")
BIO *TS_VERIFY_CTX_set_data(TS_VERIFY_CTX *ctx, BIO *b);
#endif
int TS_VERIFY_CTX_set0_data(TS_VERIFY_CTX *ctx, BIO *b);
#ifndef OPENSSL_NO_DEPRECATED_3_4
-OSSL_DEPRECATEDIN_3_4_FOR("Unclear semantics, replace with TS_VERIFY_CTX_set0_imprint().")
+OSSL_DEPRECATEDIN_3_4_FOR("unclear semantics, replace with TS_VERIFY_CTX_set0_imprint()")
unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
unsigned char *hexstr, long len);
#endif
int TS_VERIFY_CTX_set0_imprint(TS_VERIFY_CTX *ctx,
unsigned char *hexstr, long len);
#ifndef OPENSSL_NO_DEPRECATED_3_4
-OSSL_DEPRECATEDIN_3_4_FOR("Unclear semantics, replace with TS_VERIFY_CTX_set0_store().")
+OSSL_DEPRECATEDIN_3_4_FOR("unclear semantics, replace with TS_VERIFY_CTX_set0_store()")
X509_STORE *TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *s);
#endif
int TS_VERIFY_CTX_set0_store(TS_VERIFY_CTX *ctx, X509_STORE *s);
@@ -438,7 +438,7 @@ int TS_VERIFY_CTX_set0_store(TS_VERIFY_CTX *ctx, X509_STORE *s);
#define TS_VERIFY_CTS_set_certs(ctx, cert) TS_VERIFY_CTX_set_certs(ctx, cert)
#endif
#ifndef OPENSSL_NO_DEPRECATED_3_4
-OSSL_DEPRECATEDIN_3_4_FOR("Unclear semantics, replace with TS_VERIFY_CTX_set0_certs().")
+OSSL_DEPRECATEDIN_3_4_FOR("unclear semantics, replace with TS_VERIFY_CTX_set0_certs()")
STACK_OF(X509) *TS_VERIFY_CTX_set_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs);
#endif
int TS_VERIFY_CTX_set0_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs);
diff --git a/include/openssl/x509_vfy.h.in b/include/openssl/x509_vfy.h.in
index e6d19ff14c..1d20703a76 100644
--- a/include/openssl/x509_vfy.h.in
+++ b/include/openssl/x509_vfy.h.in
@@ -428,7 +428,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
#ifndef OPENSSL_NO_DEPRECATED_4_0
-OSSL_DEPRECATEDIN_4_0_FOR("Use X509_STORE_get1_objects")
+OSSL_DEPRECATEDIN_4_0_FOR("use X509_STORE_get1_objects()")
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
#endif
STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);