|
54 | 54 | #define PSA_CRYPTO_STRUCT_H
|
55 | 55 | #include "mbedtls/private_access.h"
|
56 | 56 |
|
| 57 | +#include <inttypes.h> |
| 58 | + |
57 | 59 | #ifdef __cplusplus
|
58 | 60 | extern "C" {
|
59 | 61 | #endif
|
@@ -85,11 +87,9 @@ struct psa_hash_operation_s {
|
85 | 87 | psa_driver_hash_context_t MBEDTLS_PRIVATE(ctx);
|
86 | 88 | #endif
|
87 | 89 | };
|
88 |
| -#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) && !defined(MBEDTLS_PSA_CRYPTO_C) |
89 |
| -#define PSA_HASH_OPERATION_INIT { 0 } |
90 |
| -#else |
91 |
| -#define PSA_HASH_OPERATION_INIT { 0, { 0 } } |
92 |
| -#endif |
| 90 | + |
| 91 | +#define PSA_HASH_OPERATION_INIT { } |
| 92 | + |
93 | 93 | static inline struct psa_hash_operation_s psa_hash_operation_init(void)
|
94 | 94 | {
|
95 | 95 | const struct psa_hash_operation_s v = PSA_HASH_OPERATION_INIT;
|
@@ -117,11 +117,9 @@ struct psa_cipher_operation_s {
|
117 | 117 | #endif
|
118 | 118 | };
|
119 | 119 |
|
120 |
| -#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) && !defined(MBEDTLS_PSA_CRYPTO_C) |
121 |
| -#define PSA_CIPHER_OPERATION_INIT { 0 } |
122 |
| -#else |
123 |
| -#define PSA_CIPHER_OPERATION_INIT { 0, 0, 0, 0, { 0 } } |
124 |
| -#endif |
| 120 | + |
| 121 | +#define PSA_CIPHER_OPERATION_INIT { } |
| 122 | + |
125 | 123 | static inline struct psa_cipher_operation_s psa_cipher_operation_init(void)
|
126 | 124 | {
|
127 | 125 | const struct psa_cipher_operation_s v = PSA_CIPHER_OPERATION_INIT;
|
@@ -149,11 +147,8 @@ struct psa_mac_operation_s {
|
149 | 147 | #endif
|
150 | 148 | };
|
151 | 149 |
|
152 |
| -#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) && !defined(MBEDTLS_PSA_CRYPTO_C) |
153 |
| -#define PSA_MAC_OPERATION_INIT { 0 } |
154 |
| -#else |
155 |
| -#define PSA_MAC_OPERATION_INIT { 0, 0, 0, { 0 } } |
156 |
| -#endif |
| 150 | +#define PSA_MAC_OPERATION_INIT { } |
| 151 | + |
157 | 152 | static inline struct psa_mac_operation_s psa_mac_operation_init(void)
|
158 | 153 | {
|
159 | 154 | const struct psa_mac_operation_s v = PSA_MAC_OPERATION_INIT;
|
@@ -188,11 +183,9 @@ struct psa_aead_operation_s {
|
188 | 183 | #endif
|
189 | 184 | };
|
190 | 185 |
|
191 |
| -#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) && !defined(MBEDTLS_PSA_CRYPTO_C) |
192 |
| -#define PSA_AEAD_OPERATION_INIT { 0 } |
193 |
| -#else |
194 |
| -#define PSA_AEAD_OPERATION_INIT { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 0 } } |
195 |
| -#endif |
| 186 | + |
| 187 | +#define PSA_AEAD_OPERATION_INIT { } |
| 188 | + |
196 | 189 | static inline struct psa_aead_operation_s psa_aead_operation_init(void)
|
197 | 190 | {
|
198 | 191 | const struct psa_aead_operation_s v = PSA_AEAD_OPERATION_INIT;
|
@@ -233,12 +226,9 @@ struct psa_key_derivation_s { /*!!OM*/
|
233 | 226 | #endif
|
234 | 227 | };
|
235 | 228 |
|
236 |
| -#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) && !defined(MBEDTLS_PSA_CRYPTO_C) |
237 |
| -#define PSA_KEY_DERIVATION_OPERATION_INIT { 0 } |
238 |
| -#else |
239 |
| -/* This only zeroes out the first byte in the union, the rest is unspecified. */ |
240 |
| -#define PSA_KEY_DERIVATION_OPERATION_INIT { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 0 } } |
241 |
| -#endif |
| 229 | + |
| 230 | +#define PSA_KEY_DERIVATION_OPERATION_INIT { } |
| 231 | + |
242 | 232 | static inline struct psa_key_derivation_s psa_key_derivation_operation_init(
|
243 | 233 | void)
|
244 | 234 | {
|
@@ -321,7 +311,7 @@ struct psa_key_attributes_s {
|
321 | 311 | };
|
322 | 312 |
|
323 | 313 | /* This will assert if there has ben an incompatible change in psa_key_attributes_s */
|
324 |
| -_Static_assert(sizeof(psa_key_attributes_s) == 32, "Unexpected struct size."); |
| 314 | +//_Static_assert(sizeof(struct psa_key_attributes_s) == 32, "Unexpected struct size."); |
325 | 315 |
|
326 | 316 | #if defined(MBEDTLS_PSA_CRYPTO_SE_C)
|
327 | 317 | #define PSA_KEY_ATTRIBUTES_MAYBE_SLOT_NUMBER 0, 0,
|
@@ -507,12 +497,9 @@ struct psa_pake_operation_s { /*!!OM*/
|
507 | 497 | #endif
|
508 | 498 | };
|
509 | 499 |
|
510 |
| -#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) && !defined(MBEDTLS_PSA_CRYPTO_C) |
511 |
| -#define PSA_PAKE_OPERATION_INIT { 0 } |
512 |
| -#else |
513 |
| -/* This only zeroes out the first byte in the union, the rest is unspecified. */ |
514 |
| -#define PSA_PAKE_OPERATION_INIT { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 0 } } |
515 |
| -#endif |
| 500 | + |
| 501 | +#define PSA_PAKE_OPERATION_INIT { } |
| 502 | + |
516 | 503 | static inline struct psa_pake_operation_s psa_pake_operation_init(void)
|
517 | 504 | {
|
518 | 505 | const struct psa_pake_operation_s v = PSA_PAKE_OPERATION_INIT;
|
@@ -542,11 +529,7 @@ struct psa_sign_hash_interruptible_operation_s {
|
542 | 529 | #endif
|
543 | 530 | };
|
544 | 531 |
|
545 |
| -#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) && !defined(MBEDTLS_PSA_CRYPTO_C) |
546 |
| -#define PSA_SIGN_HASH_INTERRUPTIBLE_OPERATION_INIT { 0 } |
547 |
| -#else |
548 |
| -#define PSA_SIGN_HASH_INTERRUPTIBLE_OPERATION_INIT { 0, { 0 }, 0, 0 } |
549 |
| -#endif |
| 532 | +#define PSA_SIGN_HASH_INTERRUPTIBLE_OPERATION_INIT { } |
550 | 533 |
|
551 | 534 | static inline struct psa_sign_hash_interruptible_operation_s
|
552 | 535 | psa_sign_hash_interruptible_operation_init(void)
|
@@ -580,11 +563,8 @@ struct psa_verify_hash_interruptible_operation_s {
|
580 | 563 | #endif
|
581 | 564 | };
|
582 | 565 |
|
583 |
| -#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) && !defined(MBEDTLS_PSA_CRYPTO_C) |
584 |
| -#define PSA_VERIFY_HASH_INTERRUPTIBLE_OPERATION_INIT { 0 } |
585 |
| -#else |
586 |
| -#define PSA_VERIFY_HASH_INTERRUPTIBLE_OPERATION_INIT { 0, { 0 }, 0, 0 } |
587 |
| -#endif |
| 566 | + |
| 567 | +#define PSA_VERIFY_HASH_INTERRUPTIBLE_OPERATION_INIT { } |
588 | 568 |
|
589 | 569 | static inline struct psa_verify_hash_interruptible_operation_s
|
590 | 570 | psa_verify_hash_interruptible_operation_init(void)
|
|
0 commit comments