From 7f85eb6919111b23ff15a20a193f27012e9d3cb0 Mon Sep 17 00:00:00 2001 From: Kal42 Date: Thu, 25 Apr 2024 10:30:08 +0200 Subject: [PATCH 1/5] Add pragma for bcrypt.lib Needed when build with cmake Signed-off-by: Kal42 Signed-off-by: Tobiasz Laskowski --- library/entropy_poll.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/library/entropy_poll.c b/library/entropy_poll.c index 611768cd85..96adb57213 100644 --- a/library/entropy_poll.c +++ b/library/entropy_poll.c @@ -42,6 +42,10 @@ #include #include +#if defined(_MSC_VER) +#pragma comment( lib, "bcrypt.lib" ) +#endif /* _MSC_VER */ + int mbedtls_platform_entropy_poll(void *data, unsigned char *output, size_t len, size_t *olen) { From da21d2526a39db7ab9819f671c376a03d45d7753 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Tue, 10 Sep 2024 19:33:14 +0100 Subject: [PATCH 2/5] Update changelog Signed-off-by: Tobiasz Laskowski --- ChangeLog.d/windows_pragma_lib_bcrypt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 ChangeLog.d/windows_pragma_lib_bcrypt diff --git a/ChangeLog.d/windows_pragma_lib_bcrypt b/ChangeLog.d/windows_pragma_lib_bcrypt new file mode 100644 index 0000000000..d5db64dc9f --- /dev/null +++ b/ChangeLog.d/windows_pragma_lib_bcrypt @@ -0,0 +1,2 @@ +Changes + * Add pragma bcrypt.lib to entropy_poll.c for msvc builds From eb47d8645d55559aa4d8bab3cddefe88f91fd0f2 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Tue, 10 Sep 2024 21:15:06 +0100 Subject: [PATCH 3/5] Add missing changelog entry file extension Signed-off-by: Tobiasz Laskowski --- .../{windows_pragma_lib_bcrypt => windows_pragma_lib_bcrypt.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ChangeLog.d/{windows_pragma_lib_bcrypt => windows_pragma_lib_bcrypt.txt} (100%) diff --git a/ChangeLog.d/windows_pragma_lib_bcrypt b/ChangeLog.d/windows_pragma_lib_bcrypt.txt similarity index 100% rename from ChangeLog.d/windows_pragma_lib_bcrypt rename to ChangeLog.d/windows_pragma_lib_bcrypt.txt From 8237dcc36636b7c13c7164130fe2d576aa6782c5 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Tue, 10 Sep 2024 21:18:29 +0100 Subject: [PATCH 4/5] Fix changelog entry Signed-off-by: Tobiasz Laskowski --- ChangeLog.d/windows_pragma_lib_bcrypt.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.d/windows_pragma_lib_bcrypt.txt b/ChangeLog.d/windows_pragma_lib_bcrypt.txt index d5db64dc9f..ef6c442ba2 100644 --- a/ChangeLog.d/windows_pragma_lib_bcrypt.txt +++ b/ChangeLog.d/windows_pragma_lib_bcrypt.txt @@ -1,2 +1,2 @@ Changes - * Add pragma bcrypt.lib to entropy_poll.c for msvc builds + * When building with MSVC, it is no longer necessary to link with bcrypt.lib explicitly. From d34546d527f1975965518dd708b8854ad3448c57 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Tue, 10 Sep 2024 21:36:06 +0100 Subject: [PATCH 5/5] Fix changelog entry line length Signed-off-by: Tobiasz Laskowski --- ChangeLog.d/windows_pragma_lib_bcrypt.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.d/windows_pragma_lib_bcrypt.txt b/ChangeLog.d/windows_pragma_lib_bcrypt.txt index ef6c442ba2..a5792ff251 100644 --- a/ChangeLog.d/windows_pragma_lib_bcrypt.txt +++ b/ChangeLog.d/windows_pragma_lib_bcrypt.txt @@ -1,2 +1,3 @@ Changes - * When building with MSVC, it is no longer necessary to link with bcrypt.lib explicitly. + * When building with MSVC, it is no longer necessary to link with bcrypt.lib + explicitly.