Skip to content

Commit 05773a7

Browse files
author
Janne Kiiskilä
committed
Authcrypt - stop using \r\n and use just \n
There is a fix via small `mbed_app.json` trick to get the proper C-style linechanges working.
1 parent 71b8511 commit 05773a7

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

authcrypt/authcrypt.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,22 @@ int Authcrypt::run()
7575
int ret = mbedtls_ctr_drbg_seed(&drbg, mbedtls_entropy_func, &entropy,
7676
secret_key, sizeof(secret_key));
7777
if (ret != 0) {
78-
mbedtls_printf("mbedtls_ctr_drbg_seed() returned -0x%04X\r\n", -ret);
78+
mbedtls_printf("mbedtls_ctr_drbg_seed() returned -0x%04X\n", -ret);
7979
return ret;
8080
}
8181

8282
/* Setup AES-CCM contex */
8383
ret = mbedtls_cipher_setup(&cipher,
8484
mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_128_CCM));
8585
if (ret != 0) {
86-
mbedtls_printf("mbedtls_cipher_setup() returned -0x%04X\r\n", -ret);
86+
mbedtls_printf("mbedtls_cipher_setup() returned -0x%04X\n", -ret);
8787
return ret;
8888
}
8989

9090
ret = mbedtls_cipher_setkey(&cipher, secret_key,
9191
8 * sizeof(secret_key), MBEDTLS_ENCRYPT);
9292
if (ret != 0) {
93-
mbedtls_printf("mbedtls_cipher_setkey() returned -0x%04X\r\n", -ret);
93+
mbedtls_printf("mbedtls_cipher_setkey() returned -0x%04X\n", -ret);
9494
return ret;
9595
}
9696

@@ -125,7 +125,7 @@ int Authcrypt::run()
125125
ciphertext + nonce_len + sizeof(message),
126126
tag_len);
127127
if (ret != 0) {
128-
mbedtls_printf("mbedtls_cipher_auth_encrypt() returned -0x%04X\r\n",
128+
mbedtls_printf("mbedtls_cipher_auth_encrypt() returned -0x%04X\n",
129129
-ret);
130130
return ret;
131131
}
@@ -144,7 +144,7 @@ int Authcrypt::run()
144144
ret = mbedtls_cipher_setkey(&cipher, secret_key, 8 * sizeof(secret_key),
145145
MBEDTLS_DECRYPT);
146146
if (ret != 0) {
147-
mbedtls_printf("mbedtls_cipher_setkey() returned -0x%04X\r\n", -ret);
147+
mbedtls_printf("mbedtls_cipher_setkey() returned -0x%04X\n", -ret);
148148
return ret;
149149
}
150150

@@ -160,14 +160,14 @@ int Authcrypt::run()
160160
"authentic!\r\n");
161161
return ret;
162162
} else if (ret != 0) {
163-
mbedtls_printf("mbedtls_cipher_authdecrypt() returned -0x%04X\r\n",
163+
mbedtls_printf("mbedtls_cipher_authdecrypt() returned -0x%04X\n",
164164
-ret);
165165
return ret;
166166
}
167167

168168
print_hex("decrypted", decrypted, decrypted_len);
169169

170-
mbedtls_printf("\r\nDONE\r\n");
170+
mbedtls_printf("\nDONE\n");
171171

172172
return 0;
173173
}
@@ -181,5 +181,5 @@ void Authcrypt::print_hex(const char *title,
181181
for (size_t i = 0; i < len; i++)
182182
mbedtls_printf("%02x", buf[i]);
183183

184-
mbedtls_printf("\r\n");
184+
mbedtls_printf("\n");
185185
}

authcrypt/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ int main() {
2929

3030
if (authcrypt->run() != 0) {
3131
exit_code = MBEDTLS_EXIT_FAILURE;
32-
mbedtls_printf("\r\nFAIL\r\n");
32+
mbedtls_printf("\nFAIL\n");
3333
}
3434

3535
delete authcrypt;

authcrypt/mbed_app.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
{
2-
"macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_entropy_config.h\""]
2+
"macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_entropy_config.h\""],
3+
"target_overrides": {
4+
"*": {
5+
"platform.stdio-convert-newlines": true
6+
}
7+
}
38
}

0 commit comments

Comments
 (0)