Path: blob/master/thirdparty/mbedtls/patches/0001-msvc-2019-psa-redeclaration.patch
9899 views
diff --git a/thirdparty/mbedtls/include/psa/crypto.h b/thirdparty/mbedtls/include/psa/crypto.h1index 2fe9f35ec3..ed7da26276 1006442--- a/thirdparty/mbedtls/include/psa/crypto.h3+++ b/thirdparty/mbedtls/include/psa/crypto.h4@@ -119,7 +119,9 @@ psa_status_t psa_crypto_init(void);56/** Return an initial value for a key attributes structure.7*/8+#if !(defined(__cplusplus) && defined(_MSC_VER))9static psa_key_attributes_t psa_key_attributes_init(void);10+#endif1112/** Declare a key as persistent and set its key identifier.13*14@@ -348,7 +350,9 @@ static void psa_set_key_bits(psa_key_attributes_t *attributes,15*16* \return The key type stored in the attribute structure.17*/18+#if !(defined(__cplusplus) && defined(_MSC_VER))19static psa_key_type_t psa_get_key_type(const psa_key_attributes_t *attributes);20+#endif2122/** Retrieve the key size from key attributes.23*24@@ -951,7 +955,9 @@ typedef struct psa_hash_operation_s psa_hash_operation_t;2526/** Return an initial value for a hash operation object.27*/28+#if !(defined(__cplusplus) && defined(_MSC_VER))29static psa_hash_operation_t psa_hash_operation_init(void);30+#endif3132/** Set up a multipart hash operation.33*34@@ -1310,7 +1316,9 @@ typedef struct psa_mac_operation_s psa_mac_operation_t;3536/** Return an initial value for a MAC operation object.37*/38+#if !(defined(__cplusplus) && defined(_MSC_VER))39static psa_mac_operation_t psa_mac_operation_init(void);40+#endif4142/** Set up a multipart MAC calculation operation.43*44@@ -1723,7 +1731,9 @@ typedef struct psa_cipher_operation_s psa_cipher_operation_t;4546/** Return an initial value for a cipher operation object.47*/48+#if !(defined(__cplusplus) && defined(_MSC_VER))49static psa_cipher_operation_t psa_cipher_operation_init(void);50+#endif5152/** Set the key for a multipart symmetric encryption operation.53*54@@ -2241,7 +2251,9 @@ typedef struct psa_aead_operation_s psa_aead_operation_t;5556/** Return an initial value for an AEAD operation object.57*/58+#if !(defined(__cplusplus) && defined(_MSC_VER))59static psa_aead_operation_t psa_aead_operation_init(void);60+#endif6162/** Set the key for a multipart authenticated encryption operation.63*64@@ -3228,7 +3240,9 @@ typedef struct psa_key_derivation_s psa_key_derivation_operation_t;6566/** Return an initial value for a key derivation operation object.67*/68+#if !(defined(__cplusplus) && defined(_MSC_VER))69static psa_key_derivation_operation_t psa_key_derivation_operation_init(void);70+#endif7172/** Set up a key derivation operation.73*74diff --git a/thirdparty/mbedtls/include/psa/crypto_extra.h b/thirdparty/mbedtls/include/psa/crypto_extra.h75index 70740901e1..e503c9e3ca 10064476--- a/thirdparty/mbedtls/include/psa/crypto_extra.h77+++ b/thirdparty/mbedtls/include/psa/crypto_extra.h78@@ -1164,7 +1164,9 @@ typedef struct psa_pake_cipher_suite_s psa_pake_cipher_suite_t;7980/** Return an initial value for a PAKE cipher suite object.81*/82+#if !(defined(__cplusplus) && defined(_MSC_VER))83static psa_pake_cipher_suite_t psa_pake_cipher_suite_init(void);84+#endif8586/** Retrieve the PAKE algorithm from a PAKE cipher suite.87*88@@ -1297,7 +1299,9 @@ typedef struct psa_jpake_computation_stage_s psa_jpake_computation_stage_t;8990/** Return an initial value for a PAKE operation object.91*/92+#if !(defined(__cplusplus) && defined(_MSC_VER))93static psa_pake_operation_t psa_pake_operation_init(void);94+#endif9596/** Get the length of the password in bytes from given inputs.97*9899100