Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
godotengine
GitHub Repository: godotengine/godot
 Path: blob/master/thirdparty/mbedtls/patches/0001-msvc-2019-psa-redeclaration.patch
22467 views
1
diff --git a/thirdparty/README.md b/thirdparty/README.md

2
index 49c24897ca..48aab56b70 100644

3
--- a/thirdparty/README.md

4
+++ b/thirdparty/README.md

5
@@ -654,7 +654,7 @@ File extracted from upstream source:

6
 ## mbedtls

7
 

8
 - Upstream: https://github.com/Mbed-TLS/mbedtls

9
-- Version: 3.6.4 (c765c831e5c2a0971410692f92f7a81d6ec65ec2, 2025)

10
+- Version: 3.6.5 (e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df, 2025)

11
 - License: Apache 2.0

12
 

13
 File extracted from upstream release tarball:

14
diff --git a/thirdparty/mbedtls/include/psa/crypto.h b/thirdparty/mbedtls/include/psa/crypto.h

15
index 2fe9f35ec3..ed7da26276 100644

16
--- a/thirdparty/mbedtls/include/psa/crypto.h

17
+++ b/thirdparty/mbedtls/include/psa/crypto.h

18
@@ -119,7 +119,9 @@ psa_status_t psa_crypto_init(void);

19
 

20
 /** Return an initial value for a key attributes structure.

21
  */

22
+#if !(defined(__cplusplus) && defined(_MSC_VER))

23
 static psa_key_attributes_t psa_key_attributes_init(void);

24
+#endif

25
 

26
 /** Declare a key as persistent and set its key identifier.

27
  *

28
@@ -348,7 +350,9 @@ static void psa_set_key_bits(psa_key_attributes_t *attributes,

29
  *

30
  * \return The key type stored in the attribute structure.

31
  */

32
+#if !(defined(__cplusplus) && defined(_MSC_VER))

33
 static psa_key_type_t psa_get_key_type(const psa_key_attributes_t *attributes);

34
+#endif

35
 

36
 /** Retrieve the key size from key attributes.

37
  *

38
@@ -951,7 +955,9 @@ typedef struct psa_hash_operation_s psa_hash_operation_t;

39
 

40
 /** Return an initial value for a hash operation object.

41
  */

42
+#if !(defined(__cplusplus) && defined(_MSC_VER))

43
 static psa_hash_operation_t psa_hash_operation_init(void);

44
+#endif

45
 

46
 /** Set up a multipart hash operation.

47
  *

48
@@ -1310,7 +1316,9 @@ typedef struct psa_mac_operation_s psa_mac_operation_t;

49
 

50
 /** Return an initial value for a MAC operation object.

51
  */

52
+#if !(defined(__cplusplus) && defined(_MSC_VER))

53
 static psa_mac_operation_t psa_mac_operation_init(void);

54
+#endif

55
 

56
 /** Set up a multipart MAC calculation operation.

57
  *

58
@@ -1723,7 +1731,9 @@ typedef struct psa_cipher_operation_s psa_cipher_operation_t;

59
 

60
 /** Return an initial value for a cipher operation object.

61
  */

62
+#if !(defined(__cplusplus) && defined(_MSC_VER))

63
 static psa_cipher_operation_t psa_cipher_operation_init(void);

64
+#endif

65
 

66
 /** Set the key for a multipart symmetric encryption operation.

67
  *

68
@@ -2241,7 +2251,9 @@ typedef struct psa_aead_operation_s psa_aead_operation_t;

69
 

70
 /** Return an initial value for an AEAD operation object.

71
  */

72
+#if !(defined(__cplusplus) && defined(_MSC_VER))

73
 static psa_aead_operation_t psa_aead_operation_init(void);

74
+#endif

75
 

76
 /** Set the key for a multipart authenticated encryption operation.

77
  *

78
@@ -3228,7 +3240,9 @@ typedef struct psa_key_derivation_s psa_key_derivation_operation_t;

79
 

80
 /** Return an initial value for a key derivation operation object.

81
  */

82
+#if !(defined(__cplusplus) && defined(_MSC_VER))

83
 static psa_key_derivation_operation_t psa_key_derivation_operation_init(void);

84
+#endif

85
 

86
 /** Set up a key derivation operation.

87
  *

88
diff --git a/thirdparty/mbedtls/include/psa/crypto_extra.h b/thirdparty/mbedtls/include/psa/crypto_extra.h

89
index a710397a77..7a9811bb65 100644

90
--- a/thirdparty/mbedtls/include/psa/crypto_extra.h

91
+++ b/thirdparty/mbedtls/include/psa/crypto_extra.h

92
@@ -1191,7 +1191,9 @@ typedef struct psa_pake_cipher_suite_s psa_pake_cipher_suite_t;

93
 

94
 /** Return an initial value for a PAKE cipher suite object.

95
  */

96
+#if !(defined(__cplusplus) && defined(_MSC_VER))

97
 static psa_pake_cipher_suite_t psa_pake_cipher_suite_init(void);

98
+#endif

99
 

100
 /** Retrieve the PAKE algorithm from a PAKE cipher suite.

101
  *

102
@@ -1330,7 +1332,9 @@ typedef struct psa_jpake_computation_stage_s psa_jpake_computation_stage_t;

103
 

104
 /** Return an initial value for a PAKE operation object.

105
  */

106
+#if !(defined(__cplusplus) && defined(_MSC_VER))

107
 static psa_pake_operation_t psa_pake_operation_init(void);

108
+#endif

109
 

110
 /** Get the length of the password in bytes from given inputs.

111
  *

112


113