aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Setti <vsetti@baylibre.com>2023-01-09 17:21:17 +0100
committerValerio Setti <vsetti@baylibre.com>2023-01-10 08:56:35 +0100
commitfda367efa7924043d037da1f81f6f3083e886d2e (patch)
treebfae7244ca964def140ccd726a3949f644f37493
parent70f0bbc8b2245a4a30753683febc18908fed9d8c (diff)
downloadmbedtls-features/new-code-style/test/6883/old.zip
mbedtls-features/new-code-style/test/6883/old.tar.gz
mbedtls-features/new-code-style/test/6883/old.tar.bz2
Signed-off-by: Valerio Setti <vsetti@baylibre.com>
-rw-r--r--ChangeLog.d/improve_x509_cert_writing_serial_number_management.txt2
-rw-r--r--library/x509write_crt.c2
-rw-r--r--tests/suites/test_suite_x509write.data2
-rw-r--r--tests/suites/test_suite_x509write.function4
4 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog.d/improve_x509_cert_writing_serial_number_management.txt b/ChangeLog.d/improve_x509_cert_writing_serial_number_management.txt
index 64d1b27..17286b0 100644
--- a/ChangeLog.d/improve_x509_cert_writing_serial_number_management.txt
+++ b/ChangeLog.d/improve_x509_cert_writing_serial_number_management.txt
@@ -7,4 +7,4 @@ Bugfix
New deprecations
* mbedtls_x509write_crt_set_serial() is now being deprecated in favor of
mbedtls_x509write_crt_set_serial_new(). The goal here is to remove any
- direct dependency of X509 from BIGNUM_C.
+ direct dependency of X509 on BIGNUM_C.
diff --git a/library/x509write_crt.c b/library/x509write_crt.c
index 55f22d7..0fd307c 100644
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@@ -119,7 +119,7 @@ int mbedtls_x509write_crt_set_serial( mbedtls_x509write_cert *ctx,
MBEDTLS_X509_RFC5280_MAX_SERIAL_LEN );
if( ret < 0 )
return ret;
-
+
/* Copy data to the internal structure skipping leading zeros */
memcpy(ctx->serial, &tmp[MBEDTLS_X509_RFC5280_MAX_SERIAL_LEN - tmp_len],
tmp_len);
diff --git a/tests/suites/test_suite_x509write.data b/tests/suites/test_suite_x509write.data
index 6cfbf24..a986436 100644
--- a/tests/suites/test_suite_x509write.data
+++ b/tests/suites/test_suite_x509write.data
@@ -169,4 +169,4 @@ X509 String to Names #6 (Escape at end)
mbedtls_x509_string_to_names:"C=NL, O=Offspark\":"":MBEDTLS_ERR_X509_INVALID_NAME
Check max serial length
-x509_set_serial_check: \ No newline at end of file
+x509_set_serial_check:
diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function
index d683a5ee..621c012 100644
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@@ -581,13 +581,13 @@ void x509_set_serial_check()
memset( invalid_serial, 0x01, sizeof( invalid_serial ) );
-#if defined(MBEDTLS_BIGNUM_C) && !defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_TEST_DEPRECATED) && defined(MBEDTLS_BIGNUM_C)
mbedtls_mpi serial_mpi;
mbedtls_mpi_init(&serial_mpi);
TEST_EQUAL( mbedtls_mpi_read_binary( &serial_mpi, invalid_serial,
sizeof( invalid_serial ) ), 0 );
- TEST_EQUAL( mbedtls_x509write_crt_set_serial( &ctx, &serial_mpi ),
+ TEST_EQUAL( mbedtls_x509write_crt_set_serial( &ctx, &serial_mpi ),
MBEDTLS_ERR_X509_BAD_INPUT_DATA );
mbedtls_mpi_free(&serial_mpi);
#endif