aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'crypto')
-rw-r--r--crypto/CMakeLists.txt7
-rw-r--r--crypto/Makefile.am7
-rw-r--r--crypto/compat/posix_win.c2
3 files changed, 4 insertions, 12 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 4716ddd..a5e08c5 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -487,7 +487,6 @@ set(
487 evp/bio_b64.c 487 evp/bio_b64.c
488 evp/bio_enc.c 488 evp/bio_enc.c
489 evp/bio_md.c 489 evp/bio_md.c
490 evp/c_all.c
491 evp/e_aes.c 490 evp/e_aes.c
492 evp/e_aes_cbc_hmac_sha1.c 491 evp/e_aes_cbc_hmac_sha1.c
493 evp/e_bf.c 492 evp/e_bf.c
@@ -511,6 +510,7 @@ set(
511 evp/evp_encode.c 510 evp/evp_encode.c
512 evp/evp_err.c 511 evp/evp_err.c
513 evp/evp_key.c 512 evp/evp_key.c
513 evp/evp_names.c
514 evp/evp_pbe.c 514 evp/evp_pbe.c
515 evp/evp_pkey.c 515 evp/evp_pkey.c
516 evp/m_gost2814789.c 516 evp/m_gost2814789.c
@@ -526,9 +526,6 @@ set(
526 evp/m_streebog.c 526 evp/m_streebog.c
527 evp/m_sm3.c 527 evp/m_sm3.c
528 evp/m_wp.c 528 evp/m_wp.c
529 evp/names.c
530 evp/p5_crpt.c
531 evp/p5_crpt2.c
532 evp/p_legacy.c 529 evp/p_legacy.c
533 evp/p_lib.c 530 evp/p_lib.c
534 evp/p_sign.c 531 evp/p_sign.c
@@ -572,7 +569,6 @@ set(
572 modes/gcm128.c 569 modes/gcm128.c
573 modes/ofb128.c 570 modes/ofb128.c
574 modes/xts128.c 571 modes/xts128.c
575 objects/o_names.c
576 objects/obj_dat.c 572 objects/obj_dat.c
577 objects/obj_err.c 573 objects/obj_err.c
578 objects/obj_lib.c 574 objects/obj_lib.c
@@ -600,7 +596,6 @@ set(
600 pkcs12/p12_add.c 596 pkcs12/p12_add.c
601 pkcs12/p12_asn.c 597 pkcs12/p12_asn.c
602 pkcs12/p12_attr.c 598 pkcs12/p12_attr.c
603 pkcs12/p12_crpt.c
604 pkcs12/p12_crt.c 599 pkcs12/p12_crt.c
605 pkcs12/p12_decr.c 600 pkcs12/p12_decr.c
606 pkcs12/p12_init.c 601 pkcs12/p12_init.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 611d7e0..2078531 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -600,7 +600,6 @@ libcrypto_la_SOURCES += err/err_prn.c
600libcrypto_la_SOURCES += evp/bio_b64.c 600libcrypto_la_SOURCES += evp/bio_b64.c
601libcrypto_la_SOURCES += evp/bio_enc.c 601libcrypto_la_SOURCES += evp/bio_enc.c
602libcrypto_la_SOURCES += evp/bio_md.c 602libcrypto_la_SOURCES += evp/bio_md.c
603libcrypto_la_SOURCES += evp/c_all.c
604libcrypto_la_SOURCES += evp/e_aes.c 603libcrypto_la_SOURCES += evp/e_aes.c
605libcrypto_la_SOURCES += evp/e_aes_cbc_hmac_sha1.c 604libcrypto_la_SOURCES += evp/e_aes_cbc_hmac_sha1.c
606libcrypto_la_SOURCES += evp/e_bf.c 605libcrypto_la_SOURCES += evp/e_bf.c
@@ -624,6 +623,7 @@ libcrypto_la_SOURCES += evp/evp_digest.c
624libcrypto_la_SOURCES += evp/evp_encode.c 623libcrypto_la_SOURCES += evp/evp_encode.c
625libcrypto_la_SOURCES += evp/evp_err.c 624libcrypto_la_SOURCES += evp/evp_err.c
626libcrypto_la_SOURCES += evp/evp_key.c 625libcrypto_la_SOURCES += evp/evp_key.c
626libcrypto_la_SOURCES += evp/evp_names.c
627libcrypto_la_SOURCES += evp/evp_pbe.c 627libcrypto_la_SOURCES += evp/evp_pbe.c
628libcrypto_la_SOURCES += evp/evp_pkey.c 628libcrypto_la_SOURCES += evp/evp_pkey.c
629libcrypto_la_SOURCES += evp/m_gost2814789.c 629libcrypto_la_SOURCES += evp/m_gost2814789.c
@@ -639,9 +639,6 @@ libcrypto_la_SOURCES += evp/m_sigver.c
639libcrypto_la_SOURCES += evp/m_streebog.c 639libcrypto_la_SOURCES += evp/m_streebog.c
640libcrypto_la_SOURCES += evp/m_sm3.c 640libcrypto_la_SOURCES += evp/m_sm3.c
641libcrypto_la_SOURCES += evp/m_wp.c 641libcrypto_la_SOURCES += evp/m_wp.c
642libcrypto_la_SOURCES += evp/names.c
643libcrypto_la_SOURCES += evp/p5_crpt.c
644libcrypto_la_SOURCES += evp/p5_crpt2.c
645libcrypto_la_SOURCES += evp/p_legacy.c 642libcrypto_la_SOURCES += evp/p_legacy.c
646libcrypto_la_SOURCES += evp/p_lib.c 643libcrypto_la_SOURCES += evp/p_lib.c
647libcrypto_la_SOURCES += evp/p_sign.c 644libcrypto_la_SOURCES += evp/p_sign.c
@@ -758,7 +755,6 @@ libcrypto_la_SOURCES += modes/xts128.c
758noinst_HEADERS += modes/modes_local.h 755noinst_HEADERS += modes/modes_local.h
759 756
760# objects 757# objects
761libcrypto_la_SOURCES += objects/o_names.c
762libcrypto_la_SOURCES += objects/obj_dat.c 758libcrypto_la_SOURCES += objects/obj_dat.c
763libcrypto_la_SOURCES += objects/obj_err.c 759libcrypto_la_SOURCES += objects/obj_err.c
764libcrypto_la_SOURCES += objects/obj_lib.c 760libcrypto_la_SOURCES += objects/obj_lib.c
@@ -794,7 +790,6 @@ libcrypto_la_SOURCES += pem/pvkfmt.c
794libcrypto_la_SOURCES += pkcs12/p12_add.c 790libcrypto_la_SOURCES += pkcs12/p12_add.c
795libcrypto_la_SOURCES += pkcs12/p12_asn.c 791libcrypto_la_SOURCES += pkcs12/p12_asn.c
796libcrypto_la_SOURCES += pkcs12/p12_attr.c 792libcrypto_la_SOURCES += pkcs12/p12_attr.c
797libcrypto_la_SOURCES += pkcs12/p12_crpt.c
798libcrypto_la_SOURCES += pkcs12/p12_crt.c 793libcrypto_la_SOURCES += pkcs12/p12_crt.c
799libcrypto_la_SOURCES += pkcs12/p12_decr.c 794libcrypto_la_SOURCES += pkcs12/p12_decr.c
800libcrypto_la_SOURCES += pkcs12/p12_init.c 795libcrypto_la_SOURCES += pkcs12/p12_init.c
diff --git a/crypto/compat/posix_win.c b/crypto/compat/posix_win.c
index c7cf6af..3e78a07 100644
--- a/crypto/compat/posix_win.c
+++ b/crypto/compat/posix_win.c
@@ -164,8 +164,10 @@ static void noop_handler(const wchar_t *expression, const wchar_t *function,
164} 164}
165 165
166#define BEGIN_SUPPRESS_IPH \ 166#define BEGIN_SUPPRESS_IPH \
167 int old_report_mode = _CrtSetReportMode(_CRT_ASSERT, 0); \
167 _invalid_parameter_handler old_handler = _set_thread_local_invalid_parameter_handler(noop_handler) 168 _invalid_parameter_handler old_handler = _set_thread_local_invalid_parameter_handler(noop_handler)
168#define END_SUPPRESS_IPH \ 169#define END_SUPPRESS_IPH \
170 _CrtSetReportMode(_CRT_ASSERT, old_report_mode); \
169 _set_thread_local_invalid_parameter_handler(old_handler) 171 _set_thread_local_invalid_parameter_handler(old_handler)
170 172
171#else 173#else