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

Constify security callbacks

Browse Source 
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>

MR: #1595
This commit is contained in:
Kurt Roeckx 2016-02-07 20:44:27 +01:00
parent ca74c38dc8
commit e4646a8963
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/s_cb.c
View File

@ -1285,7 +1285,7 @@ int ssl_load_stores(SSL_CTX *ctx,
typedef struct { typedef struct {
BIO *out; BIO *out;
int verbose; int verbose;
int (*old_cb) (SSL *s, SSL_CTX *ctx, int op, int bits, int nid, int (*old_cb) (const SSL *s, const SSL_CTX *ctx, int op, int bits, int nid,
void *other, void *ex); void *other, void *ex);
} security_debug_ex; } security_debug_ex;
@ -1314,7 +1314,7 @@ static STRINT_PAIR callback_types[] = {
{NULL} {NULL}
}; };
static int security_callback_debug(SSL *s, SSL_CTX *ctx, static int security_callback_debug(const SSL *s, const SSL_CTX *ctx,
int op, int bits, int nid, int op, int bits, int nid,
void *other, void *ex) void *other, void *ex)
{ {

10
include/openssl/ssl.h
View File

@ -1990,10 +1990,10 @@ int SSL_CTX_set_ctlog_list_file(SSL_CTX *ctx, const char *path);
void SSL_set_security_level(SSL *s, int level); void SSL_set_security_level(SSL *s, int level);
__owur int SSL_get_security_level(const SSL *s); __owur int SSL_get_security_level(const SSL *s);
void SSL_set_security_callback(SSL *s, void SSL_set_security_callback(SSL *s,
int (*cb) (SSL *s, SSL_CTX *ctx, int op, int (*cb) (const SSL *s, const SSL_CTX *ctx, int op,
int bits, int nid, void *other, int bits, int nid, void *other,
void *ex)); void *ex));
int (*SSL_get_security_callback(const SSL *s)) (SSL *s, SSL_CTX *ctx, int op, int (*SSL_get_security_callback(const SSL *s)) (const SSL *s, const SSL_CTX *ctx, int op,
int bits, int nid, int bits, int nid,
void *other, void *ex); void *other, void *ex);
void SSL_set0_security_ex_data(SSL *s, void *ex); void SSL_set0_security_ex_data(SSL *s, void *ex);
@ -2002,11 +2002,11 @@ __owur void *SSL_get0_security_ex_data(const SSL *s);
void SSL_CTX_set_security_level(SSL_CTX *ctx, int level); void SSL_CTX_set_security_level(SSL_CTX *ctx, int level);
__owur int SSL_CTX_get_security_level(const SSL_CTX *ctx); __owur int SSL_CTX_get_security_level(const SSL_CTX *ctx);
void SSL_CTX_set_security_callback(SSL_CTX *ctx, void SSL_CTX_set_security_callback(SSL_CTX *ctx,
int (*cb) (SSL *s, SSL_CTX *ctx, int op, int (*cb) (const SSL *s, const SSL_CTX *ctx, int op,
int bits, int nid, void *other, int bits, int nid, void *other,
void *ex)); void *ex));
int (*SSL_CTX_get_security_callback(const SSL_CTX *ctx)) (SSL *s, int (*SSL_CTX_get_security_callback(const SSL_CTX *ctx)) (const SSL *s,
SSL_CTX *ctx, const SSL_CTX *ctx,
int op, int bits, int op, int bits,
int nid, int nid,
void *other, void *other,

8
ssl/ssl_cert.c
View File

@ -132,7 +132,7 @@
#include "internal/threads.h" #include "internal/threads.h"
#include "ssl_locl.h" #include "ssl_locl.h"
static int ssl_security_default_callback(SSL *s, SSL_CTX *ctx, int op, static int ssl_security_default_callback(const SSL *s, const SSL_CTX *ctx, int op,
int bits, int nid, void *other, int bits, int nid, void *other,
void *ex); void *ex);
@ -1062,7 +1062,7 @@ int ssl_cert_set_cert_store(CERT *c, X509_STORE *store, int chain, int ref)
return 1; return 1;
} }
static int ssl_security_default_callback(SSL *s, SSL_CTX *ctx, int op, static int ssl_security_default_callback(const SSL *s, const SSL_CTX *ctx, int op,
int bits, int nid, void *other, int bits, int nid, void *other,
void *ex) void *ex)
{ {
@ -1144,12 +1144,12 @@ static int ssl_security_default_callback(SSL *s, SSL_CTX *ctx, int op,
return 1; return 1;
} }
int ssl_security(SSL *s, int op, int bits, int nid, void *other) int ssl_security(const SSL *s, int op, int bits, int nid, void *other)
{ {
return s->cert->sec_cb(s, NULL, op, bits, nid, other, s->cert->sec_ex); return s->cert->sec_cb(s, NULL, op, bits, nid, other, s->cert->sec_ex);
} }
int ssl_ctx_security(SSL_CTX *ctx, int op, int bits, int nid, void *other) int ssl_ctx_security(const SSL_CTX *ctx, int op, int bits, int nid, void *other)
{ {
return ctx->cert->sec_cb(NULL, ctx, op, bits, nid, other, return ctx->cert->sec_cb(NULL, ctx, op, bits, nid, other,
ctx->cert->sec_ex); ctx->cert->sec_ex);

10
ssl/ssl_lib.c
View File

@ -3786,14 +3786,14 @@ int SSL_get_security_level(const SSL *s)
} }
void SSL_set_security_callback(SSL *s, void SSL_set_security_callback(SSL *s,
int (*cb) (SSL *s, SSL_CTX *ctx, int op, int (*cb) (const SSL *s, const SSL_CTX *ctx, int op,
int bits, int nid, void *other, int bits, int nid, void *other,
void *ex)) void *ex))
{ {
s->cert->sec_cb = cb; s->cert->sec_cb = cb;
} }
int (*SSL_get_security_callback(const SSL *s)) (SSL *s, SSL_CTX *ctx, int op, int (*SSL_get_security_callback(const SSL *s)) (const SSL *s, const SSL_CTX *ctx, int op,
int bits, int nid, int bits, int nid,
void *other, void *ex) { void *other, void *ex) {
return s->cert->sec_cb; return s->cert->sec_cb;
@ -3820,15 +3820,15 @@ int SSL_CTX_get_security_level(const SSL_CTX *ctx)
} }
void SSL_CTX_set_security_callback(SSL_CTX *ctx, void SSL_CTX_set_security_callback(SSL_CTX *ctx,
int (*cb) (SSL *s, SSL_CTX *ctx, int op, int (*cb) (const SSL *s, const SSL_CTX *ctx, int op,
int bits, int nid, void *other, int bits, int nid, void *other,
void *ex)) void *ex))
{ {
ctx->cert->sec_cb = cb; ctx->cert->sec_cb = cb;
} }
int (*SSL_CTX_get_security_callback(const SSL_CTX *ctx)) (SSL *s, int (*SSL_CTX_get_security_callback(const SSL_CTX *ctx)) (const SSL *s,
SSL_CTX *ctx, const SSL_CTX *ctx,
int op, int bits, int op, int bits,
int nid, int nid,
void *other, void *other,

6
ssl/ssl_locl.h
View File

@ -1636,7 +1636,7 @@ typedef struct cert_st {
custom_ext_methods cli_ext; custom_ext_methods cli_ext;
custom_ext_methods srv_ext; custom_ext_methods srv_ext;
/* Security callback */ /* Security callback */
int (*sec_cb) (SSL *s, SSL_CTX *ctx, int op, int bits, int nid, int (*sec_cb) (const SSL *s, const SSL_CTX *ctx, int op, int bits, int nid,
void *other, void *ex); void *other, void *ex);
/* Security level */ /* Security level */
int sec_level; int sec_level;
@ -1912,8 +1912,8 @@ __owur int ssl_add_cert_chain(SSL *s, CERT_PKEY *cpk, unsigned long *l);
__owur int ssl_build_cert_chain(SSL *s, SSL_CTX *ctx, int flags); __owur int ssl_build_cert_chain(SSL *s, SSL_CTX *ctx, int flags);
__owur int ssl_cert_set_cert_store(CERT *c, X509_STORE *store, int chain, int ref); __owur int ssl_cert_set_cert_store(CERT *c, X509_STORE *store, int chain, int ref);
__owur int ssl_security(SSL *s, int op, int bits, int nid, void *other); __owur int ssl_security(const SSL *s, int op, int bits, int nid, void *other);
__owur int ssl_ctx_security(SSL_CTX *ctx, int op, int bits, int nid, void *other); __owur int ssl_ctx_security(const SSL_CTX *ctx, int op, int bits, int nid, void *other);
int ssl_undefined_function(SSL *s); int ssl_undefined_function(SSL *s);
__owur int ssl_undefined_void_function(void); __owur int ssl_undefined_void_function(void);