projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If the source has already been succesfully queried, do not try to open it
[openssl.git]
/
apps
/
s_cb.c
diff --git
a/apps/s_cb.c
b/apps/s_cb.c
index ba0b548ea12bd4923032438e547437b667208b38..fd622597d62b1a62cc76eb6fb458829bc85d6ed7 100644
(file)
--- a/
apps/s_cb.c
+++ b/
apps/s_cb.c
@@
-1,4
+1,4
@@
-/* apps/s_cb.c */
+/* apps/s_cb.c
- callback functions used by s_client, s_server, and s_time
*/
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@
-63,17
+63,15
@@
#include "apps.h"
#undef NON_MAIN
#undef USE_SOCKETS
#include "apps.h"
#undef NON_MAIN
#undef USE_SOCKETS
-#include
"err.h"
-#include
"x509.h"
-#include
"ssl.h"
+#include
<openssl/err.h>
+#include
<openssl/x509.h>
+#include
<openssl/ssl.h>
#include "s_apps.h"
int verify_depth=0;
int verify_error=X509_V_OK;
#include "s_apps.h"
int verify_depth=0;
int verify_error=X509_V_OK;
-int MS_CALLBACK verify_callback(ok, ctx)
-int ok;
-X509_STORE_CTX *ctx;
+int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)
{
char buf[256];
X509 *err_cert;
{
char buf[256];
X509 *err_cert;
@@
-123,10
+121,7
@@
X509_STORE_CTX *ctx;
return(ok);
}
return(ok);
}
-int set_cert_stuff(ctx, cert_file, key_file)
-SSL_CTX *ctx;
-char *cert_file;
-char *key_file;
+int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
{
if (cert_file != NULL)
{
{
if (cert_file != NULL)
{
@@
-181,13
+176,8
@@
char *key_file;
return(1);
}
return(1);
}
-long MS_CALLBACK bio_dump_cb(bio,cmd,argp,argi,argl,ret)
-BIO *bio;
-int cmd;
-char *argp;
-int argi;
-long argl;
-long ret;
+long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp, int argi,
+ long argl, long ret)
{
BIO *out;
{
BIO *out;
@@
-210,10
+200,7
@@
long ret;
return(ret);
}
return(ret);
}
-void MS_CALLBACK apps_ssl_info_callback(s,where,ret)
-SSL *s;
-int where;
-int ret;
+void MS_CALLBACK apps_ssl_info_callback(SSL *s, int where, int ret)
{
char *str;
int w;
{
char *str;
int w;