Land #922, build fixes for various platforms

3 files changed, 2 insertions, 44 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index d61e607..7efb143 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -111,7 +111,6 @@ if(HOST_ASM_MACOSX_X86_64)
                 bn/arch/amd64/word_clz.S
                 bn/arch/amd64/bn_arch.c
         )
-        add_definitions(-Dendbr64=)
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
         add_definitions(-DVPAES_ASM)
@@ -153,6 +152,7 @@ if(HOST_ASM_MASM_X86_64)
                 whrlpool/wp-masm-x86_64.S
                 cpuid-masm-x86_64.S
         )
+        add_definitions(-Dendbr64=)
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
         add_definitions(-DVPAES_ASM)
@@ -193,6 +193,7 @@ if(HOST_ASM_MINGW64_X86_64)
                 whrlpool/wp-mingw64-x86_64.S
                 cpuid-mingw64-x86_64.S
         )
+        add_definitions(-Dendbr64=)
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
         add_definitions(-DVPAES_ASM)
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64
index 219a7ac..b9b89cf 100644
--- a/crypto/Makefile.am.macosx-x86_64
+++ b/crypto/Makefile.am.macosx-x86_64
@@ -34,7 +34,6 @@ ASM_X86_64_MACOSX += bn/arch/amd64/bn_arch.c
 EXTRA_DIST += $(ASM_X86_64_MACOSX)
 
 if HOST_ASM_MACOSX_X86_64
-libcrypto_la_CPPFLAGS += -Dendbr64=
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
diff --git a/crypto/compat/ui_openssl_win.c b/crypto/compat/ui_openssl_win.c
index c245111..b6a621f 100644
--- a/crypto/compat/ui_openssl_win.c
+++ b/crypto/compat/ui_openssl_win.c
@@ -139,9 +139,6 @@ static int is_a_tty;
 
 /* Declare static functions */
 static int read_till_nl(FILE *);
-static void recsig(int);
-static void pushsig(void);
-static void popsig(void);
 static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl);
 
 static int read_string(UI *ui, UI_STRING *uis);
@@ -236,8 +233,6 @@ read_till_nl(FILE *in)
         return 1;
 }
 
-static volatile sig_atomic_t intr_signal;
-
 static int
 read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
 {
@@ -247,12 +242,9 @@ read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
         int maxsize = BUFSIZ - 1;
         char *p;
 
-        intr_signal = 0;
         ok = 0;
         ps = 0;
 
-        pushsig();
-
         ps = 1;
 
         if (!echo && !noecho_console(ui))
@@ -276,16 +268,11 @@ read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
                 ok = 1;
 
 error:
-        if (intr_signal == SIGINT)
-                ok = -1;
         if (!echo)
                 fprintf(tty_out, "\n");
         if (ps >= 2 && !echo && !echo_console(ui))
                 ok = 0;
 
-        if (ps >= 1)
-                popsig();
-
         explicit_bzero(result, BUFSIZ);
         return ok;
 }
@@ -348,32 +335,3 @@ close_console(UI *ui)
 
         return 1;
 }
-
-/* Internal functions to handle signals and act on them */
-static void
-pushsig(void)
-{
-        savsig[SIGABRT] = signal(SIGABRT, recsig);
-        savsig[SIGFPE]  = signal(SIGFPE,  recsig);
-        savsig[SIGILL]  = signal(SIGILL,  recsig);
-        savsig[SIGINT]  = signal(SIGINT,  recsig);
-        savsig[SIGSEGV] = signal(SIGSEGV, recsig);
-        savsig[SIGTERM] = signal(SIGTERM, recsig);
-}
-
-static void
-popsig(void)
-{
-        signal(SIGABRT, savsig[SIGABRT]);
-        signal(SIGFPE,  savsig[SIGFPE]);
-        signal(SIGILL,  savsig[SIGILL]);
-        signal(SIGINT,  savsig[SIGINT]);
-        signal(SIGSEGV, savsig[SIGSEGV]);
-        signal(SIGTERM, savsig[SIGTERM]);
-}
-
-static void
-recsig(int i)
-{
-        intr_signal = i;
-}