Synchronise with Unix

[oweals/openssl.git] / demos / easy_tls / easy-tls.c

diff --git a/demos/easy_tls/easy-tls.c b/demos/easy_tls/easy-tls.c
index 88d7a8a1ec1ea54e62a288671c068d140f7811c5..9cd8314c3e4f92e32dcff5ca9db35580c03882e3 100644 (file)
--- a/demos/easy_tls/easy-tls.c
+++ b/demos/easy_tls/easy-tls.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; c-file-style: "bsd" -*- */
 /*
  * easy-tls.c -- generic TLS proxy.
- * $Id: easy-tls.c,v 1.1 2001/09/17 19:06:57 bodo Exp $
+ * $Id: easy-tls.c,v 1.4 2002/03/05 09:07:16 bodo Exp $
  */
 /*
  (c) Copyright 1999 Bodo Moeller.  All rights reserved.
@@ -73,7 +73,7 @@
  */
 
 static char const rcsid[] =
-"$Id: easy-tls.c,v 1.1 2001/09/17 19:06:57 bodo Exp $";
+"$Id: easy-tls.c,v 1.4 2002/03/05 09:07:16 bodo Exp $";
 
 #include <assert.h>
 #include <errno.h>
@@ -362,7 +362,7 @@ tls_openssl_errors(const char *app_prefix_1, const char *app_prefix_2, const cha
     assert(app_prefix_2 != NULL);
 
     if (default_text == NULL)
-       default_text = "???";
+       default_text = "?""?""?";
     
     while ((err = ERR_get_error_line_data(&file,&line,&data,&flags)) != 0) {
        if (reasons_i < sizeof reasons) {
@@ -567,8 +567,13 @@ no_passphrase_callback(char *buf, int num, int w, void *arg)
     return -1;
 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x00907000L
+static int
+verify_dont_fail_cb(X509_STORE_CTX *c, void *unused_arg)
+#else
 static int
 verify_dont_fail_cb(X509_STORE_CTX *c)
+#endif
 {
     int i;