oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

constify

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19839 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-01-11 09:55:09 +00:00
parent 396d442179
commit 82a45c7036
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/hx509/crypto.c
View File

@@ -96,7 +96,7 @@ struct hx509_private_key {
*/ */
struct signature_alg { struct signature_alg {
char *name; const char *name;
const heim_oid *(*sig_oid)(void); const heim_oid *(*sig_oid)(void);
const AlgorithmIdentifier *(*sig_alg)(void); const AlgorithmIdentifier *(*sig_alg)(void);
const heim_oid *(*key_oid)(void); const heim_oid *(*key_oid)(void);
@@ -1296,7 +1296,7 @@ _hx509_generate_private_key(hx509_context context,
* *
*/ */
static const heim_octet_string null_entry_oid = { 2, "\x05\x00" }; static const heim_octet_string null_entry_oid = { 2, rk_UNCONST("\x05\x00") };
static const unsigned sha512_oid_tree[] = { 2, 16, 840, 1, 101, 3, 4, 3 }; static const unsigned sha512_oid_tree[] = { 2, 16, 840, 1, 101, 3, 4, 3 };
const AlgorithmIdentifier _hx509_signature_sha512_data = { const AlgorithmIdentifier _hx509_signature_sha512_data = {

3
lib/hx509/error.c
View File

@@ -128,7 +128,8 @@ void
hx509_err(hx509_context context, int exit_code, int error_code, char *fmt, ...) hx509_err(hx509_context context, int exit_code, int error_code, char *fmt, ...)
{ {
va_list ap; va_list ap;
char *msg, *str; const char *msg;
char *str;
va_start(ap, fmt); va_start(ap, fmt);
vasprintf(&str, fmt, ap); vasprintf(&str, fmt, ap);

2
lib/hx509/hx_locl.h
View File

@@ -144,7 +144,7 @@ struct hx509_query_data {
}; };
struct hx509_keyset_ops { struct hx509_keyset_ops {
char *name; const char *name;
int flags; int flags;
int (*init)(hx509_context, hx509_certs, void **, int (*init)(hx509_context, hx509_certs, void **,
int, const char *, hx509_lock); int, const char *, hx509_lock);

6
lib/hx509/keyset.c
View File

@@ -358,7 +358,7 @@ hx509_get_one_cert(hx509_context context, hx509_certs certs, hx509_cert *c)
} }
static int static int
certs_info_stdio(void *ctx, char *str) certs_info_stdio(void *ctx, const char *str)
{ {
FILE *f = ctx; FILE *f = ctx;
fprintf(f, "%s\n", str); fprintf(f, "%s\n", str);
@@ -368,7 +368,7 @@ certs_info_stdio(void *ctx, char *str)
int int
hx509_certs_info(hx509_context context, hx509_certs_info(hx509_context context,
hx509_certs certs, hx509_certs certs,
int (*func)(void *, char *), int (*func)(void *, const char *),
void *ctx) void *ctx)
{ {
if (func == NULL) { if (func == NULL) {
@@ -385,7 +385,7 @@ hx509_certs_info(hx509_context context,
} }
void void
_hx509_pi_printf(int (*func)(void *, char *), void *ctx, _hx509_pi_printf(int (*func)(void *, const char *), void *ctx,
char *fmt, ...) char *fmt, ...)
{ {
va_list ap; va_list ap;

2
lib/hx509/ks_p11.c
View File

@@ -1113,7 +1113,7 @@ static int
p11_printinfo(hx509_context context, p11_printinfo(hx509_context context,
hx509_certs certs, hx509_certs certs,
void *data, void *data,
int (*func)(void *, char *), int (*func)(void *, const char *),
void *ctx) void *ctx)
{ {
struct p11_module *p = data; struct p11_module *p = data;