generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Comments.

Browse Source
This commit is contained in:
Bodo Möller 1999-08-08 14:21:04 +00:00
parent 5e63691972
commit 204cf1abb0
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/s_client.c
View File

@ -142,7 +142,7 @@ static void sc_usage(void)
#ifdef FIONBIO #ifdef FIONBIO
BIO_printf(bio_err," -nbio - Run with non-blocking IO\n"); BIO_printf(bio_err," -nbio - Run with non-blocking IO\n");
#endif #endif
#ifdef APPS_CRLF #ifdef APPS_CRLF /* won't be #ifdef'd in next release */
BIO_printf(bio_err," -crlf - convert LF from terminal into CRLF\n"); BIO_printf(bio_err," -crlf - convert LF from terminal into CRLF\n");
#endif #endif
BIO_printf(bio_err," -quiet - no s_client output\n"); BIO_printf(bio_err," -quiet - no s_client output\n");

4
apps/s_server.c
View File

@ -169,8 +169,8 @@ static char *s_dcert_file=NULL,*s_dkey_file=NULL;
static int s_nbio=0; static int s_nbio=0;
#endif #endif
static int s_nbio_test=0; static int s_nbio_test=0;
#ifdef APPS_CRLF #ifdef APPS_CRLF /* won't be #ifdef'd in next release */
int s_crlf=0; int s_crlf=0;
#endif #endif
static SSL_CTX *ctx=NULL; static SSL_CTX *ctx=NULL;
static int www=0; static int www=0;

2
ssl/ssl.h
View File

@ -413,7 +413,7 @@ struct ssl_ctx_st
/* if defined, these override the X509_verify_cert() calls */ /* if defined, these override the X509_verify_cert() calls */
/**/ int (*app_verify_callback)(); /**/ int (*app_verify_callback)();
/**/ char *app_verify_arg; /* never used */ /**/ char *app_verify_arg; /* never used; should be void * */
/* default values to use in SSL structures */ /* default values to use in SSL structures */
/**/ struct cert_st /* CERT */ *cert; /**/ struct cert_st /* CERT */ *cert;

2
ssl/ssl_cert.c
View File

@ -426,7 +426,7 @@ int ssl_verify_cert_chain(SSL *s,STACK_OF(X509) *sk)
(char *)s); (char *)s);
if (s->ctx->app_verify_callback != NULL) if (s->ctx->app_verify_callback != NULL)
i=s->ctx->app_verify_callback(&ctx); i=s->ctx->app_verify_callback(&ctx); /* should pass app_verify_arg */
else else
{ {
#ifndef NO_X509_VERIFY #ifndef NO_X509_VERIFY

5
ssl/ssl_lib.c
View File

@ -1142,6 +1142,11 @@ void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx,void *u)
void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx,int (*cb)(),char *arg) void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx,int (*cb)(),char *arg)
{ {
/* now
* int (*cb)(X509_STORE_CTX *),
* but should be
* int (*cb)(X509_STORE_CTX *, void *arg)
*/
ctx->app_verify_callback=cb; ctx->app_verify_callback=cb;
ctx->app_verify_arg=arg; /* never used */ ctx->app_verify_arg=arg; /* never used */
} }