aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog1
-rw-r--r--crypto/CMakeLists.txt1
-rw-r--r--crypto/Makefile.am2
-rw-r--r--patches/aeadtest.c.patch15
-rw-r--r--tests/CMakeLists.txt5
-rw-r--r--tests/Makefile.am5
6 files changed, 14 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a797ba..3c90f4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,7 @@ LibreSSL Portable Release Notes:
51 - Removed EC_GROUP precomp machinery. 51 - Removed EC_GROUP precomp machinery.
52 - Ensure no X.509v3 extensions appear more than once in certificates. 52 - Ensure no X.509v3 extensions appear more than once in certificates.
53 - Cleaned up various ECDH, ECDSA and EC internals. 53 - Cleaned up various ECDH, ECDSA and EC internals.
54 - Replaced ASN1_bn_print with a cleaner internal implementation.
54 * New features 55 * New features
55 * Compatibility changes 56 * Compatibility changes
56 - X509_NAME_get_text_by_{NID,OBJ}() now only succeed if they contain 57 - X509_NAME_get_text_by_{NID,OBJ}() now only succeed if they contain
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 302352b..0c86dd4 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -365,6 +365,7 @@ set(
365 bn/bn_mul.c 365 bn/bn_mul.c
366 bn/bn_prime.c 366 bn/bn_prime.c
367 bn/bn_primitives.c 367 bn/bn_primitives.c
368 bn/bn_print.c
368 bn/bn_rand.c 369 bn/bn_rand.c
369 bn/bn_recp.c 370 bn/bn_recp.c
370 bn/bn_shift.c 371 bn/bn_shift.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index cf611a2..60e9c00 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -366,6 +366,7 @@ libcrypto_la_SOURCES += bn/bn_mont.c
366libcrypto_la_SOURCES += bn/bn_mul.c 366libcrypto_la_SOURCES += bn/bn_mul.c
367libcrypto_la_SOURCES += bn/bn_prime.c 367libcrypto_la_SOURCES += bn/bn_prime.c
368libcrypto_la_SOURCES += bn/bn_primitives.c 368libcrypto_la_SOURCES += bn/bn_primitives.c
369libcrypto_la_SOURCES += bn/bn_print.c
369libcrypto_la_SOURCES += bn/bn_rand.c 370libcrypto_la_SOURCES += bn/bn_rand.c
370libcrypto_la_SOURCES += bn/bn_recp.c 371libcrypto_la_SOURCES += bn/bn_recp.c
371libcrypto_la_SOURCES += bn/bn_shift.c 372libcrypto_la_SOURCES += bn/bn_shift.c
@@ -729,6 +730,7 @@ noinst_HEADERS += hidden/openssl/hmac.h
729noinst_HEADERS += hidden/openssl/pkcs12.h 730noinst_HEADERS += hidden/openssl/pkcs12.h
730noinst_HEADERS += hidden/openssl/pkcs7.h 731noinst_HEADERS += hidden/openssl/pkcs7.h
731noinst_HEADERS += hidden/openssl/stack.h 732noinst_HEADERS += hidden/openssl/stack.h
733noinst_HEADERS += hidden/openssl/ts.h
732noinst_HEADERS += hidden/openssl/ui.h 734noinst_HEADERS += hidden/openssl/ui.h
733noinst_HEADERS += hidden/openssl/x509.h 735noinst_HEADERS += hidden/openssl/x509.h
734noinst_HEADERS += hidden/openssl/x509_vfy.h 736noinst_HEADERS += hidden/openssl/x509_vfy.h
diff --git a/patches/aeadtest.c.patch b/patches/aeadtest.c.patch
deleted file mode 100644
index b3fe052..0000000
--- a/patches/aeadtest.c.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1--- tests/aeadtest.c.orig Mon Sep 5 22:30:33 2022
2+++ tests/aeadtest.c Mon Sep 5 23:51:27 2022
3@@ -48,6 +48,12 @@
4
5 #define BUF_MAX 1024
6
7+#ifdef _MSC_VER
8+#ifdef IN
9+#undef IN
10+#endif
11+#endif
12+
13 /* These are the different types of line that are found in the input file. */
14 enum {
15 AEAD = 0, /* name of the AEAD algorithm. */
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9edb613..cefba2e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -198,6 +198,11 @@ add_executable(bn_primes bn_primes.c)
198target_link_libraries(bn_primes ${OPENSSL_TEST_LIBS}) 198target_link_libraries(bn_primes ${OPENSSL_TEST_LIBS})
199add_test(bn_primes bn_primes) 199add_test(bn_primes bn_primes)
200 200
201# bn_print
202add_executable(bn_print bn_print.c)
203target_link_libraries(bn_print ${OPENSSL_TEST_LIBS})
204add_test(bn_print bn_print)
205
201# bn_rand_interval 206# bn_rand_interval
202add_executable(bn_rand_interval bn_rand_interval.c) 207add_executable(bn_rand_interval bn_rand_interval.c)
203target_link_libraries(bn_rand_interval ${OPENSSL_TEST_LIBS}) 208target_link_libraries(bn_rand_interval ${OPENSSL_TEST_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 70371d3..646c927 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -213,6 +213,11 @@ TESTS += bn_primes
213check_PROGRAMS += bn_primes 213check_PROGRAMS += bn_primes
214bn_primes_SOURCES = bn_primes.c 214bn_primes_SOURCES = bn_primes.c
215 215
216# bn_print
217TESTS += bn_print
218check_PROGRAMS += bn_print
219bn_print_SOURCES = bn_print.c
220
216# bn_rand_interval 221# bn_rand_interval
217TESTS += bn_rand_interval 222TESTS += bn_rand_interval
218check_PROGRAMS += bn_rand_interval 223check_PROGRAMS += bn_rand_interval