Correct a lot of printing calls. Remove extra arguments...

[openssl.git] / crypto / dsa / dsatest.c

diff --git a/crypto/dsa/dsatest.c b/crypto/dsa/dsatest.c
index 1ab90cfd7e493c23bbe3d3d395177a323e24db67..53c73c5cc252c65aae0f738dd6b51aea2e2ed591 100644 (file)
--- a/crypto/dsa/dsatest.c
+++ b/crypto/dsa/dsatest.c
@@ -56,6 +56,12 @@
  * [including the GNU Public Licence.]
  */
 
+/* Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code */
+#ifdef OPENSSL_NO_DEPRECATED
+#undef OPENSSL_NO_DEPRECATED
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -68,9 +74,9 @@
 #include <openssl/rand.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
+#ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
-#ifdef OPENSSL_SYS_WINDOWS
-#include "../bio/bss_file.c"
+#include <openssl/e_os2.h>
 #endif
 
 #ifdef OPENSSL_NO_DSA
@@ -160,7 +166,7 @@ int main(int argc, char **argv)
                BIO_printf(bio_err,"%02X%02X%02X%02X ",
                        seed[i],seed[i+1],seed[i+2],seed[i+3]);
                }
-       BIO_printf(bio_err,"\ncounter=%d h=%d\n",counter,h);
+       BIO_printf(bio_err,"\ncounter=%d h=%ld\n",counter,h);
                
        if (dsa == NULL) goto end;
        DSA_print(bio_err,dsa,0);