Fix deprecated docs for PKCS1
diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index c7b6e4e..6f6ffe7 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -776,9 +776,9 @@
#if defined(MBEDTLS_PKCS11_C)
#if defined(MBEDTLS_DEPRECATED_REMOVED)
-#error "MBEDTLS_PKCS11_C is deprecated and will likely be removed in a future version of Mbed TLS"
+#error "MBEDTLS_PKCS11_C is deprecated and will be removed in a future version of Mbed TLS"
#elif defined(MBEDTLS_DEPRECATED_WARNING)
-#warning "MBEDTLS_PKCS11_C is deprecated and will likely be removed in a future version of Mbed TLS"
+#warning "MBEDTLS_PKCS11_C is deprecated and will be removed in a future version of Mbed TLS"
#endif
#endif /* MBEDTLS_PKCS11_C */
diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 789ba5b..62f5446 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -2814,8 +2814,8 @@
*
* Enable wrapper for PKCS#11 smartcard support.
*
- * \deprecated This option is deprecated and will likely be removed in a
- * future version of Mbed TLS.
+ * \deprecated This option is deprecated and will be removed in a future
+ * version of Mbed TLS.
*
* Module: library/pkcs11.c
* Caller: library/pk.c
diff --git a/include/mbedtls/pkcs11.h b/include/mbedtls/pkcs11.h
index e5b4607..2247bf7 100644
--- a/include/mbedtls/pkcs11.h
+++ b/include/mbedtls/pkcs11.h
@@ -72,18 +72,16 @@
* Initialize a mbedtls_pkcs11_context.
* (Just making memory references valid.)
*
- * \deprecated It is deprecated and discouraged to call this function
- * as future versions of the library are likely to remove
- * it.
+ * \deprecated This function is deprecated and will be removed in a
+ * future version of the library.
*/
MBEDTLS_DEPRECATED void mbedtls_pkcs11_init( mbedtls_pkcs11_context *ctx );
/**
* Fill in a mbed TLS certificate, based on the given PKCS11 helper certificate.
*
- * \deprecated It is deprecated and discouraged to call this function
- * as future versions of the library are likely to remove
- * it.
+ * \deprecated This function is deprecated and will be removed in a
+ * future version of the library.
*
* \param cert X.509 certificate to fill
* \param pkcs11h_cert PKCS #11 helper certificate
@@ -98,9 +96,8 @@
* mbedtls_pkcs11_context will take over control of the certificate, freeing it when
* done.
*
- * \deprecated It is deprecated and discouraged to call this function
- * as future versions of the library are likely to remove
- * it.
+ * \deprecated This function is deprecated and will be removed in a
+ * future version of the library.
*
* \param priv_key Private key structure to fill.
* \param pkcs11_cert PKCS #11 helper certificate
@@ -115,9 +112,8 @@
* Free the contents of the given private key context. Note that the structure
* itself is not freed.
*
- * \deprecated It is deprecated and discouraged to call this function
- * as future versions of the library are likely to remove
- * it.
+ * \deprecated This function is deprecated and will be removed in a
+ * future version of the library.
*
* \param priv_key Private key structure to cleanup
*/
@@ -128,8 +124,8 @@
* \brief Do an RSA private key decrypt, then remove the message
* padding
*
- * \deprecated It is deprecated and discouraged to call this function as
- * future versions of the library are likely to remove it.
+ * \deprecated This function is deprecated and will be removed in a future
+ * version of the library.
*
* \param ctx PKCS #11 context
* \param mode must be MBEDTLS_RSA_PRIVATE, for compatibility with rsa.c's signature
@@ -153,8 +149,8 @@
/**
* \brief Do a private RSA to sign a message digest
*
- * \deprecated It is deprecated and discouraged to call this function as
- * future versions of the library are likely to remove it.
+ * \deprecated This function is deprecated and will be removed in a future
+ * version of the library.
*
* \param ctx PKCS #11 context
* \param mode must be MBEDTLS_RSA_PRIVATE, for compatibility with rsa.c's signature
@@ -179,8 +175,8 @@
/**
* SSL/TLS wrappers for PKCS#11 functions
*
- * \deprecated It is deprecated and discouraged to call these functions as
- * future versions of the library are likely to remove them.
+ * \deprecated This function is deprecated and will be removed in a future
+ * version of the library.
*/
MBEDTLS_DEPRECATED static inline int mbedtls_ssl_pkcs11_decrypt( void *ctx,
int mode, size_t *olen,
