Move verify externs into the header file.

diff --git a/usr.bin/openssl/s_apps.h b/usr.bin/openssl/s_apps.h
index dd4b733..177ec87 100644 (file)
--- a/usr.bin/openssl/s_apps.h
+++ b/usr.bin/openssl/s_apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_apps.h,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: s_apps.h,v 1.2 2015/04/14 12:56:36 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -115,6 +115,10 @@
 #define PORT_STR        "4433"
 #define PROTOCOL        "tcp"
 
+extern int verify_depth;
+extern int verify_error;
+extern int verify_return_error;
+
 int do_server(int port, int type, int *ret,
     int (*cb)(char *hostname, int s, unsigned char *context),
     unsigned char *context);

diff --git a/usr.bin/openssl/s_client.c b/usr.bin/openssl/s_client.c
index 835b448..83a515c 100644 (file)
--- a/usr.bin/openssl/s_client.c
+++ b/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.12 2015/01/13 10:48:24 bluhm Exp $ */
+/* $OpenBSD: s_client.c,v 1.13 2015/04/14 12:56:36 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -171,10 +171,6 @@
 
 #define BUFSIZZ 1024*8
 
-extern int verify_depth;
-extern int verify_error;
-extern int verify_return_error;
-
 static int c_nbio = 0;
 static int c_Pause = 0;
 static int c_debug = 0;

diff --git a/usr.bin/openssl/s_server.c b/usr.bin/openssl/s_server.c
index fdd9397..5ef801a 100644 (file)
--- a/usr.bin/openssl/s_server.c
+++ b/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_server.c,v 1.9 2014/12/14 14:42:06 jsing Exp $ */
+/* $OpenBSD: s_server.c,v 1.10 2015/04/14 12:56:36 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -202,8 +202,6 @@ static int accept_socket = -1;
 #define TEST_CERT      "server.pem"
 #define TEST_CERT2     "server2.pem"
 
-extern int verify_depth, verify_return_error;
-
 static char *cipher = NULL;
 static int s_server_verify = SSL_VERIFY_NONE;
 static int s_server_session_id_context = 1;    /* anything will do */

diff --git a/usr.bin/openssl/s_time.c b/usr.bin/openssl/s_time.c
index ed9da3e..2e7c97d 100644 (file)
--- a/usr.bin/openssl/s_time.c
+++ b/usr.bin/openssl/s_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_time.c,v 1.5 2015/04/14 11:45:00 jsing Exp $ */
+/* $OpenBSD: s_time.c,v 1.6 2015/04/14 12:56:36 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -94,8 +94,6 @@
 #define max(a,b) (((a) > (b)) ? (a) : (b))
 
 #define SECONDS        30
-extern int verify_depth;
-extern int verify_error;
 
 static void s_time_usage(void);
 static SSL *doConnection(SSL * scon);