diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-11-30 13:04:43 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-11-30 13:04:43 +0000 |
| commit | 34a8c7ec874d58f7bf3916d3055fd9ab237d16f2 (patch) | |
| tree | dcbf888d713b5d37bc831b1eb3f10d63da4bb0e9 /ssl/ssl_sess.c | |
| parent | d4a62400056e4ce1e3a010802fcf10dd8003c8e3 (diff) | |
Win32 fixes.
Use OPENSSL_NO_RFC3779 instead of OPENSSL_RFC3779: this makes the Win32 scripts
work and is consistent with other options.
Fix Win32 scripts and Configure to process OPENSSL_NO_RFC3779 properly.
Update ordinals.
Change some prototypes for LSB because VC++ 6 doesn't like the */ sequence and thinks it is an invalid end of comment.
Diffstat (limited to 'ssl/ssl_sess.c')
| -rw-r--r-- | ssl/ssl_sess.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index b539c16924..12012501c2 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -771,18 +771,18 @@ void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx, ctx->new_session_cb=cb; } -int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(struct ssl_st */*ssl*/,SSL_SESSION */*sess*/) +int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(SSL *ssl, SSL_SESSION *sess) { return ctx->new_session_cb; } void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx, - void (*cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess)) + void (*cb)(SSL_CTX *ctx,SSL_SESSION *sess)) { ctx->remove_session_cb=cb; } -void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(struct ssl_ctx_st */*ctx*/,SSL_SESSION */*sess*/) +void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(SSL_CTX * ctx,SSL_SESSION *sess) { return ctx->remove_session_cb; } @@ -794,8 +794,8 @@ void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx, ctx->get_session_cb=cb; } -SSL_SESSION * (*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st */*ssl*/, - unsigned char */*data*/,int /*len*/,int */*copy*/) +SSL_SESSION * (*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(SSL *ssl, + unsigned char *data,int len,int *copy) { return ctx->get_session_cb; } @@ -806,7 +806,7 @@ void SSL_CTX_set_info_callback(SSL_CTX *ctx, ctx->info_callback=cb; } -void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL */*ssl*/,int /*type*/,int /*val*/) +void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl,int type,int val) { return ctx->info_callback; } @@ -817,7 +817,7 @@ void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx, ctx->client_cert_cb=cb; } -int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL * /*ssl */, X509 **/* x509 */, EVP_PKEY **/*pkey*/) +int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL * ssl, X509 ** x509 , EVP_PKEY **pkey) { return ctx->client_cert_cb; } |