1 files changed, 6 insertions, 11 deletions

diff --git a/src/lib/libcrypto/dsa/dsatest.c b/src/lib/libcrypto/dsa/dsatest.c
index 4734ce4af8..12da64f9f4 100644
--- a/src/lib/libcrypto/dsa/dsatest.c
+++ b/src/lib/libcrypto/dsa/dsatest.c
@@ -61,13 +61,14 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
-#include "../e_os.h"
-
 #include <openssl/crypto.h>
 #include <openssl/rand.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
+#include <openssl/engine.h>
+#ifdef OPENSSL_SYS_WINDOWS
+#include "../bio/bss_file.c"
+#endif
 
 #ifdef OPENSSL_NO_DSA
 int main(int argc, char *argv[])
@@ -211,16 +212,10 @@ end:
                 BIO_free(bio_err);
                 bio_err = NULL;
                 }
-        EXIT(!ret);
+        exit(!ret);
         return(0);
         }
 
-static int cb_exit(int ec)
-        {
-        EXIT(ec);
-        return(0);              /* To keep some compilers quiet */
-        }
-
 static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
         {
         char c='*';
@@ -236,7 +231,7 @@ static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
         if (!ok && (p == 0) && (num > 1))
                 {
                 BIO_printf((BIO *)arg,"error in dsatest\n");
-                cb_exit(1);
+                exit(1);
                 }
         }
 #endif