commit 9359f4d70312adb1405d6611e25e1a4e1521c93c
author Max Fillinger <max@max-fillinger.net> Sat Sep 21 10:48:57 2024 +0200
committer Max Fillinger <maximilian.fillinger@foxcrypto.com> Wed Apr 16 11:20:49 2025 +0200
tree 98a261fba4eb86c0170ce9fbfebbb037e5c236c9
parent 15f9f5e5629a46ce14eec97c144453cc299c0fe0

Fix coding style

Signed-off-by: Max Fillinger <max@max-fillinger.net>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 9e4cf3e..a109cfc 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -10056,9 +10056,12 @@
 
 static int mbedtls_ssl_tls12_export_keying_material(const mbedtls_ssl_context *ssl,
                                                     const mbedtls_md_type_t hash_alg,
-                                                    uint8_t *out, const size_t key_len,
-                                                    const char *label, const size_t label_len,
-                                                    const unsigned char *context, const size_t context_len,
+                                                    uint8_t *out,
+                                                    const size_t key_len,
+                                                    const char *label,
+                                                    const size_t label_len,
+                                                    const unsigned char *context,
+                                                    const size_t context_len,
                                                     const int use_context)
 {
     int ret = 0;
@@ -10087,8 +10090,8 @@
     memcpy(prf_input, ssl->transform->randbytes + 32, 32);
     memcpy(prf_input + 32, ssl->transform->randbytes, 32);
     if (use_context) {
-        prf_input[64] = (unsigned char)((context_len >> 8) & 0xff);
-        prf_input[65] = (unsigned char)(context_len & 0xff);
+        prf_input[64] = (unsigned char) ((context_len >> 8) & 0xff);
+        prf_input[65] = (unsigned char) (context_len & 0xff);
         memcpy(prf_input + 66, context, context_len);
     }
     ret = tls_prf_generic(hash_alg, ssl->session->master, 48, label_str,
@@ -10103,9 +10106,12 @@
 
 static int mbedtls_ssl_tls13_export_keying_material(mbedtls_ssl_context *ssl,
                                                     const mbedtls_md_type_t hash_alg,
-                                                    uint8_t *out, const size_t key_len,
-                                                    const char *label, const size_t label_len,
-                                                    const unsigned char *context, const size_t context_len)
+                                                    uint8_t *out,
+                                                    const size_t key_len,
+                                                    const char *label,
+                                                    const size_t label_len,
+                                                    const unsigned char *context,
+                                                    const size_t context_len)
 {
     const psa_algorithm_t psa_hash_alg = mbedtls_md_psa_alg_from_type(hash_alg);
     const size_t hash_len = PSA_HASH_LENGTH(hash_alg);
@@ -10116,7 +10122,7 @@
     }
 
     return mbedtls_ssl_tls13_exporter(psa_hash_alg, secret, hash_len,
-                                      (const unsigned char *)label, label_len,
+                                      (const unsigned char *) label, label_len,
                                       context, context_len, out, key_len);
 }
 
@@ -10140,7 +10146,12 @@
                                                             label, label_len,
                                                             context, context_len, use_context);
         case MBEDTLS_SSL_VERSION_TLS1_3:
-            return mbedtls_ssl_tls13_export_keying_material(ssl, hash_alg, out, key_len, label, label_len,
+            return mbedtls_ssl_tls13_export_keying_material(ssl,
+                                                            hash_alg,
+                                                            out,
+                                                            key_len,
+                                                            label,
+                                                            label_len,
                                                             use_context ? context : NULL,
                                                             use_context ? context_len : 0);
         default:

library/ssl_tls13_keys.c

diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c
index 9098418..e0a8669 100644
--- a/library/ssl_tls13_keys.c
+++ b/library/ssl_tls13_keys.c
@@ -1893,14 +1893,20 @@
     int ret = 0;
 
     ret = mbedtls_ssl_tls13_derive_secret(hash_alg, secret, secret_len, label, label_len, NULL, 0,
-                                          MBEDTLS_SSL_TLS1_3_CONTEXT_UNHASHED, hkdf_secret, hash_len);
+                                          MBEDTLS_SSL_TLS1_3_CONTEXT_UNHASHED, hkdf_secret,
+                                          hash_len);
     if (ret != 0) {
         goto exit;
     }
-    ret = mbedtls_ssl_tls13_derive_secret(hash_alg, hkdf_secret, hash_len,
+    ret = mbedtls_ssl_tls13_derive_secret(hash_alg,
+                                          hkdf_secret,
+                                          hash_len,
                                           MBEDTLS_SSL_TLS1_3_LBL_WITH_LEN(exporter),
-                                          context_value, context_len, MBEDTLS_SSL_TLS1_3_CONTEXT_UNHASHED,
-                                          out, out_len);
+                                          context_value,
+                                          context_len,
+                                          MBEDTLS_SSL_TLS1_3_CONTEXT_UNHASHED,
+                                          out,
+                                          out_len);
 
 exit:
     mbedtls_platform_zeroize(hkdf_secret, sizeof(hkdf_secret));