fixed a bunch of compiler warnings, pgp end certificate listing

This commit is contained in:
Martin Willi
2009-04-21 15:36:58 +00:00
parent c258a3b36a
commit 134c9d9db0
5 changed files with 6 additions and 11 deletions
+2 -9
View File
@@ -129,8 +129,6 @@ static __inline__ void *malloc_bytes_st(size_t size, struct db_ops_stats *st)
int
db_prop_init(struct db_context *ctx, u_int8_t protoid, int max_trans, int max_attrs)
{
int ret=-1;
ctx->trans0 = NULL;
ctx->attrs0 = NULL;
@@ -145,12 +143,7 @@ db_prop_init(struct db_context *ctx, u_int8_t protoid, int max_trans, int max_at
db_attrs_st);
memset(ctx->attrs0, '\0', sizeof(struct db_attr) * max_attrs);
}
ret = 0;
out:
if (ret < 0 && ctx->trans0) {
PFREE_ST(ctx->trans0, db_trans_st);
ctx->trans0 = NULL;
}
ctx->max_trans = max_trans;
ctx->max_attrs = max_attrs;
ctx->trans_cur = ctx->trans0;
@@ -158,7 +151,7 @@ out:
ctx->prop.protoid = protoid;
ctx->prop.trans = ctx->trans0;
ctx->prop.trans_cnt = 0;
return ret;
return 0;
}
/* Expand storage for transforms by number delta_trans */
+1
View File
@@ -30,6 +30,7 @@
#include <freeswan.h>
#include <ipsec_policy.h>
#include <asn1/asn1.h>
#include "constants.h"
#include "defs.h"
+1 -1
View File
@@ -633,7 +633,7 @@ list_pgp_end_certs(bool utc)
c.type = CERT_PGP;
c.u.pgp = cert;
whack_log(RC_COMMENT, "%T, count: %d", &cert->installed, utc), cert->count;
whack_log(RC_COMMENT, "%T, count: %d", &cert->installed, utc, cert->count);
datatot(cert->fingerprint, PGP_FINGERPRINT_SIZE, 'x', buf, BUF_LEN);
whack_log(RC_COMMENT, " fingerprint: %s", buf);
form_keyid(cert->publicExponent, cert->modulus, buf, &keysize);
+1 -1
View File
@@ -560,7 +560,7 @@ chunk_t pkcs1_build_signature(chunk_t tbs, int hash_alg,
u_char digest_buf[MAX_DIGEST_LEN];
chunk_t digest = { digest_buf, MAX_DIGEST_LEN };
chunk_t digestInfo, alg_id, signatureValue;
chunk_t digestInfo, signatureValue;
u_char *pos;
if (!compute_digest(tbs, hash_alg, &digest))
+1
View File
@@ -72,6 +72,7 @@
#include "crypto.h" /* requires sha1.h and md5.h */
#include "nat_traversal.h"
#include "virtual.h"
#include "timer.h"
static void usage(const char *mess)
{