diff options
author | Hakan Olsson <ho@cvs.openbsd.org> | 2003-11-06 16:12:09 +0000 |
---|---|---|
committer | Hakan Olsson <ho@cvs.openbsd.org> | 2003-11-06 16:12:09 +0000 |
commit | 794afd1bf2b19666384a8bcd3ee110d63f62f167 (patch) | |
tree | a1a498cdc9e2c556b3b5429bfe2bc35fc15dda26 /sbin/isakmpd | |
parent | 19ab6f203585d2248f3829418d72906d79d633f4 (diff) |
Style nits.
Diffstat (limited to 'sbin/isakmpd')
-rw-r--r-- | sbin/isakmpd/dnssec.c | 4 | ||||
-rw-r--r-- | sbin/isakmpd/exchange.c | 8 | ||||
-rw-r--r-- | sbin/isakmpd/field.c | 4 | ||||
-rw-r--r-- | sbin/isakmpd/if.c | 6 | ||||
-rw-r--r-- | sbin/isakmpd/ike_auth.c | 31 | ||||
-rw-r--r-- | sbin/isakmpd/ipsec.c | 10 | ||||
-rw-r--r-- | sbin/isakmpd/key.c | 10 | ||||
-rw-r--r-- | sbin/isakmpd/log.c | 4 | ||||
-rw-r--r-- | sbin/isakmpd/message.c | 4 | ||||
-rw-r--r-- | sbin/isakmpd/message.h | 4 | ||||
-rw-r--r-- | sbin/isakmpd/monitor_fdpass.c | 4 | ||||
-rw-r--r-- | sbin/isakmpd/pf_key_v2.c | 16 | ||||
-rw-r--r-- | sbin/isakmpd/policy.c | 4 | ||||
-rw-r--r-- | sbin/isakmpd/ui.c | 4 | ||||
-rw-r--r-- | sbin/isakmpd/x509.c | 6 | ||||
-rw-r--r-- | sbin/isakmpd/x509.h | 4 |
16 files changed, 62 insertions, 61 deletions
diff --git a/sbin/isakmpd/dnssec.c b/sbin/isakmpd/dnssec.c index bff607cdb37..85dfed006d8 100644 --- a/sbin/isakmpd/dnssec.c +++ b/sbin/isakmpd/dnssec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dnssec.c,v 1.16 2003/06/03 14:28:16 ho Exp $ */ +/* $OpenBSD: dnssec.c,v 1.17 2003/11/06 16:12:07 ho Exp $ */ /* * Copyright (c) 2001 Håkan Olsson. All rights reserved. @@ -150,7 +150,7 @@ dns_get_key (int type, struct message *msg, int *keylen) break; if (*umark != '@') { - LOG_DBG((LOG_MISC, 50, "dns_get_key: bad UFQDN ID")); + LOG_DBG ((LOG_MISC, 50, "dns_get_key: bad UFQDN ID")); return 0; } *umark++ = '\0'; diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c index f142c2f4cf7..edae64a75cc 100644 --- a/sbin/isakmpd/exchange.c +++ b/sbin/isakmpd/exchange.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exchange.c,v 1.87 2003/11/06 15:55:54 ho Exp $ */ +/* $OpenBSD: exchange.c,v 1.88 2003/11/06 16:12:07 ho Exp $ */ /* $EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $ */ /* @@ -1037,7 +1037,7 @@ exchange_setup_p1 (struct message *msg, u_int32_t doi) * Find out our inbound phase 1 mode. */ t->vtbl->get_dst (t, &dst); - if (sockaddr2text(dst, &str, 0) == -1) + if (sockaddr2text (dst, &str, 0) == -1) return 0; name = conf_get_str ("Phase 1", str); free (str); @@ -1693,7 +1693,7 @@ exchange_add_certs (struct message *msg) log_print ("exchange_add_certs: could not obtain cert for a type %d " "cert request", aca->id); if (cert) - free(cert); + free (cert); return -1; } new_cert = realloc (cert, ISAKMP_CERT_SZ + certlen); @@ -1702,7 +1702,7 @@ exchange_add_certs (struct message *msg) log_error ("exchange_add_certs: realloc (%p, %d) failed", cert, ISAKMP_CERT_SZ + certlen); if (cert) - free(cert); + free (cert); return -1; } cert = new_cert; diff --git a/sbin/isakmpd/field.c b/sbin/isakmpd/field.c index 6cead59b028..9217487f4ab 100644 --- a/sbin/isakmpd/field.c +++ b/sbin/isakmpd/field.c @@ -1,4 +1,4 @@ -/* $OpenBSD: field.c,v 1.12 2003/06/03 14:28:16 ho Exp $ */ +/* $OpenBSD: field.c,v 1.13 2003/11/06 16:12:07 ho Exp $ */ /* $EOM: field.c,v 1.11 2000/02/20 19:58:37 niklas Exp $ */ /* @@ -71,7 +71,7 @@ field_debug_raw (u_int8_t *buf, size_t len, struct constant_map **maps) return 0; strlcpy (retval, "0x", 3 + len * 2); p = retval + 2; - for(; len > 0; len--) + for (; len > 0; len--) { snprintf (p, 1 + len * 2, "%02x", *buf++); p += 2; diff --git a/sbin/isakmpd/if.c b/sbin/isakmpd/if.c index 1116b4113c1..3794928f7c0 100644 --- a/sbin/isakmpd/if.c +++ b/sbin/isakmpd/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.15 2003/09/25 14:15:15 cloder Exp $ */ +/* $OpenBSD: if.c,v 1.16 2003/11/06 16:12:07 ho Exp $ */ /* $EOM: if.c,v 1.12 1999/10/01 13:45:20 niklas Exp $ */ /* @@ -122,13 +122,13 @@ if_map (int (*func) (char *, struct sockaddr *, void *), void *arg) #ifdef HAVE_GETIFADDRS struct ifaddrs *ifap, *ifa; - if (getifaddrs(&ifap) < 0) + if (getifaddrs (&ifap) < 0) return -1; for (ifa = ifap; ifa; ifa = ifa->ifa_next) if ((*func) (ifa->ifa_name, ifa->ifa_addr, arg) == -1) err = -1; - freeifaddrs(ifap); + freeifaddrs (ifap); #else struct ifconf ifc; struct ifreq *ifrp; diff --git a/sbin/isakmpd/ike_auth.c b/sbin/isakmpd/ike_auth.c index b6ae826062b..a9504acae00 100644 --- a/sbin/isakmpd/ike_auth.c +++ b/sbin/isakmpd/ike_auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ike_auth.c,v 1.80 2003/10/14 14:29:15 ho Exp $ */ +/* $OpenBSD: ike_auth.c,v 1.81 2003/11/06 16:12:07 ho Exp $ */ /* $EOM: ike_auth.c,v 1.59 2000/11/21 00:21:31 angelos Exp $ */ /* @@ -443,10 +443,11 @@ sig_gen_skeyid (struct exchange *exchange, size_t *sz) memcpy (key + exchange->nonce_i_len, exchange->nonce_r, exchange->nonce_r_len); - LOG_DBG((LOG_NEGOTIATION, 80, "sig_gen_skeyid: PRF type %d, hash %d", - ie->prf_type, ie->hash->type)); - LOG_DBG_BUF((LOG_NEGOTIATION, 80, "sig_gen_skeyid: SKEYID initialized with", - (u_int8_t *)key, exchange->nonce_i_len + exchange->nonce_r_len)); + LOG_DBG ((LOG_NEGOTIATION, 80, "sig_gen_skeyid: PRF type %d, hash %d", + ie->prf_type, ie->hash->type)); + LOG_DBG_BUF ((LOG_NEGOTIATION, 80, "sig_gen_skeyid: SKEYID initialized with", + (u_int8_t *)key, + exchange->nonce_i_len + exchange->nonce_r_len)); prf = prf_alloc (ie->prf_type, ie->hash->type, key, exchange->nonce_i_len + exchange->nonce_r_len); @@ -464,10 +465,10 @@ sig_gen_skeyid (struct exchange *exchange, size_t *sz) return 0; } - LOG_DBG((LOG_NEGOTIATION, 80, "sig_gen_skeyid: g^xy length %lu", - (unsigned long)ie->g_x_len)); - LOG_DBG_BUF((LOG_NEGOTIATION, 80, - "sig_gen_skeyid: SKEYID fed with g^xy", ie->g_xy, ie->g_x_len)); + LOG_DBG ((LOG_NEGOTIATION, 80, "sig_gen_skeyid: g^xy length %lu", + (unsigned long)ie->g_x_len)); + LOG_DBG_BUF ((LOG_NEGOTIATION, 80, "sig_gen_skeyid: SKEYID fed with g^xy", + ie->g_xy, ie->g_x_len)); prf->Init (prf->prfctx); prf->Update (prf->prfctx, ie->g_xy, ie->g_x_len); @@ -1260,19 +1261,19 @@ get_raw_key_from_file (int type, u_int8_t *id, size_t id_len, RSA **rsa) } if (BIO_read_filename (bio, filename) <= 0) { - LOG_DBG((LOG_NEGOTIATION, 50, "get_raw_key_from_file: " - "BIO_read_filename(bio, \"%s\") failed", filename)); + LOG_DBG ((LOG_NEGOTIATION, 50, "get_raw_key_from_file: " + "BIO_read_filename(bio, \"%s\") failed", filename)); BIO_free (bio); return -1; } - LOG_DBG((LOG_NEGOTIATION, 80, "get_raw_key_from_file: reading file %s", - filename)); + LOG_DBG ((LOG_NEGOTIATION, 80, "get_raw_key_from_file: reading file %s", + filename)); *rsa = PEM_read_bio_RSA_PUBKEY (bio, NULL, NULL, NULL); BIO_free (bio); } else - LOG_DBG((LOG_NEGOTIATION, 50, "get_raw_key_from_file: file %s not found", - filename)); + LOG_DBG ((LOG_NEGOTIATION, 50, "get_raw_key_from_file: file %s not found", + filename)); return (*rsa ? 0 : -1); } diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c index 82d5276efdc..9ae26b29dfc 100644 --- a/sbin/isakmpd/ipsec.c +++ b/sbin/isakmpd/ipsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec.c,v 1.82 2003/11/06 15:50:53 ho Exp $ */ +/* $OpenBSD: ipsec.c,v 1.83 2003/11/06 16:12:07 ho Exp $ */ /* $EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $ */ /* @@ -1956,7 +1956,7 @@ ipsec_decode_id (char *buf, int size, u_int8_t *id, size_t id_len, case IPSEC_ID_USER_FQDN: /* String is not NUL terminated, be careful */ id_len -= ISAKMP_ID_DATA_OFF; - id_len = MIN(id_len, size - 1); + id_len = MIN (id_len, size - 1); memcpy (buf, id + ISAKMP_ID_DATA_OFF, id_len); buf[id_len] = '\0'; break; @@ -1967,7 +1967,7 @@ ipsec_decode_id (char *buf, int size, u_int8_t *id, size_t id_len, id_len - ISAKMP_ID_DATA_OFF); if (!addr) { - snprintf(buf, size, "unparsable ASN1 DN ID"); + snprintf (buf, size, "unparsable ASN1 DN ID"); return; } strlcpy (buf, addr, size); @@ -2404,7 +2404,7 @@ ipsec_id_string (u_int8_t *id, size_t id_len) strlcpy (buf, GET_ISAKMP_ID_TYPE (id) == IPSEC_ID_FQDN ? "fqdn/" : "ufqdn/", size); - len = strlen(buf); + len = strlen (buf); memcpy (buf + len, id + ISAKMP_ID_DATA_OFF, id_len); *(buf + len + id_len) = '\0'; @@ -2413,7 +2413,7 @@ ipsec_id_string (u_int8_t *id, size_t id_len) #ifdef USE_X509 case IPSEC_ID_DER_ASN1_DN: strlcpy (buf, "asn1_dn/", size); - len = strlen(buf); + len = strlen (buf); addrstr = x509_DN_string (id + ISAKMP_ID_DATA_OFF, id_len - ISAKMP_ID_DATA_OFF); if (!addrstr) diff --git a/sbin/isakmpd/key.c b/sbin/isakmpd/key.c index ca0f7a003c0..932b3d347e6 100644 --- a/sbin/isakmpd/key.c +++ b/sbin/isakmpd/key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.12 2002/09/11 09:50:44 ho Exp $ */ +/* $OpenBSD: key.c,v 1.13 2003/11/06 16:12:07 ho Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) * @@ -68,8 +68,8 @@ key_serialize (int type, int private, void *key, u_int8_t **data, size_t *datale *data = p = malloc (*datalen); if (!p) { - log_error("key_serialize: malloc (%lu) failed", - (unsigned long)*datalen); + log_error ("key_serialize: malloc (%lu) failed", + (unsigned long)*datalen); return; } *datalen = i2d_RSAPublicKey ((RSA *)key, &p); @@ -80,8 +80,8 @@ key_serialize (int type, int private, void *key, u_int8_t **data, size_t *datale *data = p = malloc (*datalen); if (!p) { - log_error("key_serialize: malloc (%lu) failed", - (unsigned long)*datalen); + log_error ("key_serialize: malloc (%lu) failed", + (unsigned long)*datalen); return; } *datalen = i2d_RSAPrivateKey ((RSA *)key, &p); diff --git a/sbin/isakmpd/log.c b/sbin/isakmpd/log.c index 160f73d0495..7c656f489d7 100644 --- a/sbin/isakmpd/log.c +++ b/sbin/isakmpd/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.35 2003/06/10 16:41:29 deraadt Exp $ */ +/* $OpenBSD: log.c,v 1.36 2003/11/06 16:12:07 ho Exp $ */ /* $EOM: log.c,v 1.30 2000/09/29 08:19:23 niklas Exp $ */ /* @@ -163,7 +163,7 @@ _log_print (int error, int syslog_level, const char *fmt, va_list ap, class == LOG_PRINT ? "Default" : "Report>"); strlcat (nbuf, buffer, sizeof nbuf); #if defined (USE_PRIVSEP) - strlcat (nbuf, getuid() ? "" : " [priv]", LOG_SIZE + 32); + strlcat (nbuf, getuid () ? "" : " [priv]", LOG_SIZE + 32); #endif strlcat (nbuf, "\n", sizeof nbuf); diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c index 030132fb9ff..dcbd9c5e656 100644 --- a/sbin/isakmpd/message.c +++ b/sbin/isakmpd/message.c @@ -1,4 +1,4 @@ -/* $OpenBSD: message.c,v 1.62 2003/11/06 15:55:54 ho Exp $ */ +/* $OpenBSD: message.c,v 1.63 2003/11/06 16:12:07 ho Exp $ */ /* $EOM: message.c,v 1.156 2000/10/10 12:36:39 provos Exp $ */ /* @@ -1659,7 +1659,7 @@ message_drop (struct message *msg, int notify, struct proto *proto, } log_print ("dropped message from %s port %d due to notification type %s", - address ? address : "<unknown>", htons(port), + address ? address : "<unknown>", htons (port), constant_name (isakmp_notify_cst, notify)); /* If specified, return a notification. */ diff --git a/sbin/isakmpd/message.h b/sbin/isakmpd/message.h index efc88bd3fe0..3cb2153336a 100644 --- a/sbin/isakmpd/message.h +++ b/sbin/isakmpd/message.h @@ -1,4 +1,4 @@ -/* $OpenBSD: message.h,v 1.16 2003/06/04 07:31:17 ho Exp $ */ +/* $OpenBSD: message.h,v 1.17 2003/11/06 16:12:07 ho Exp $ */ /* $EOM: message.h,v 1.51 2000/10/10 12:36:39 provos Exp $ */ /* @@ -160,7 +160,7 @@ struct message { /* This message should be kept on the prioritized sendq. */ #define MSG_PRIORITIZED 8 -TAILQ_HEAD(msg_head, message); +TAILQ_HEAD (msg_head, message); extern int message_add_payload (struct message *, u_int8_t, u_int8_t *, size_t, int); diff --git a/sbin/isakmpd/monitor_fdpass.c b/sbin/isakmpd/monitor_fdpass.c index c409d8c38dc..14370205349 100644 --- a/sbin/isakmpd/monitor_fdpass.c +++ b/sbin/isakmpd/monitor_fdpass.c @@ -41,7 +41,7 @@ mm_send_fd (int socket, int fd) char ch = '\0'; ssize_t n; - memset(&msg, 0, sizeof msg); + memset (&msg, 0, sizeof msg); msg.msg_control = (caddr_t)tmp; msg.msg_controllen = CMSG_LEN (sizeof (int)); cmsg = CMSG_FIRSTHDR (&msg); @@ -87,7 +87,7 @@ mm_receive_fd (int socket) msg.msg_control = tmp; msg.msg_controllen = sizeof tmp; - if ((n = recvmsg(socket, &msg, 0)) == -1) + if ((n = recvmsg (socket, &msg, 0)) == -1) { log_error ("%s: recvmsg", __func__); return -1; diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c index f2a91e01da9..e4d93821a6a 100644 --- a/sbin/isakmpd/pf_key_v2.c +++ b/sbin/isakmpd/pf_key_v2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_key_v2.c,v 1.136 2003/08/08 08:37:36 ho Exp $ */ +/* $OpenBSD: pf_key_v2.c,v 1.137 2003/11/06 16:12:07 ho Exp $ */ /* $EOM: pf_key_v2.c,v 1.79 2000/12/12 00:33:19 niklas Exp $ */ /* @@ -961,9 +961,9 @@ pf_key_v2_set_spi (struct sa *sa, struct proto *proto, int incoming, case IPSEC_AUTH_HMAC_RIPEMD: #ifdef SADB_X_AALG_RIPEMD160HMAC96 ssa.sadb_sa_auth = SADB_X_AALG_RIPEMD160HMAC96; -#elif defined(SADB_X_AALG_RIPEMD160HMAC) +#elif defined (SADB_X_AALG_RIPEMD160HMAC) ssa.sadb_sa_auth = SADB_X_AALG_RIPEMD160HMAC; -#elif defined(SADB_X_AALG_RIPEMD160) +#elif defined (SADB_X_AALG_RIPEMD160) ssa.sadb_sa_auth = SADB_X_AALG_RIPEMD160; #else ssa.sadb_sa_auth = SADB_AALG_RIPEMD160HMAC; @@ -1030,9 +1030,9 @@ pf_key_v2_set_spi (struct sa *sa, struct proto *proto, int incoming, case IPSEC_AH_RIPEMD: #ifdef SADB_X_AALG_RIPEMD160HMAC96 ssa.sadb_sa_auth = SADB_X_AALG_RIPEMD160HMAC96; -#elif defined(SADB_X_AALG_RIPEMD160HMAC) +#elif defined (SADB_X_AALG_RIPEMD160HMAC) ssa.sadb_sa_auth = SADB_X_AALG_RIPEMD160HMAC; -#elif defined(SADB_X_AALG_RIPEMD160) +#elif defined (SADB_X_AALG_RIPEMD160) ssa.sadb_sa_auth = SADB_X_AALG_RIPEMD160; #else ssa.sadb_sa_auth = SADB_AALG_RIPEMD160HMAC; @@ -1147,8 +1147,8 @@ pf_key_v2_set_spi (struct sa *sa, struct proto *proto, int incoming, ssa.sadb_sa_exttype = SADB_EXT_SA; ssa.sadb_sa_len = sizeof ssa / PF_KEY_V2_CHUNK; if (proto->spi_sz[incoming] == 2) /* IPCOMP uses 16bit CPIs. */ - ssa.sadb_sa_spi = htonl(proto->spi[incoming][0] << 8 - | proto->spi[incoming][1]); + ssa.sadb_sa_spi = htonl (proto->spi[incoming][0] << 8 + | proto->spi[incoming][1]); else memcpy (&ssa.sadb_sa_spi, proto->spi[incoming], sizeof ssa.sadb_sa_spi); ssa.sadb_sa_replay @@ -1375,7 +1375,7 @@ pf_key_v2_set_spi (struct sa *sa, struct proto *proto, int incoming, else sid->sadb_ident_exttype = SADB_EXT_IDENTITY_DST; - memcpy(sid + 1, pp, len); + memcpy (sid + 1, pp, len); free (pp); if (pf_key_v2_msg_add (update, (struct sadb_ext *)sid, diff --git a/sbin/isakmpd/policy.c b/sbin/isakmpd/policy.c index ddc856896c7..a33e155092a 100644 --- a/sbin/isakmpd/policy.c +++ b/sbin/isakmpd/policy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: policy.c,v 1.66 2003/07/25 08:31:16 markus Exp $ */ +/* $OpenBSD: policy.c,v 1.67 2003/11/06 16:12:08 ho Exp $ */ /* $EOM: policy.c,v 1.49 2000/10/24 13:33:39 niklas Exp $ */ /* @@ -2210,7 +2210,7 @@ keynote_cert_get_key (void *scert, void *keyp) void * keynote_cert_dup (void *cert) { - return strdup((char *)cert); + return strdup ((char *)cert); } void diff --git a/sbin/isakmpd/ui.c b/sbin/isakmpd/ui.c index d3a39b5d677..b7373f64a80 100644 --- a/sbin/isakmpd/ui.c +++ b/sbin/isakmpd/ui.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ui.c,v 1.34 2003/10/13 13:57:51 ho Exp $ */ +/* $OpenBSD: ui.c,v 1.35 2003/11/06 16:12:08 ho Exp $ */ /* $EOM: ui.c,v 1.43 2000/10/05 09:25:12 niklas Exp $ */ /* @@ -137,7 +137,7 @@ static void ui_teardown_all (char *cmd) { /* Skip 'cmd' as arg. */ - sa_teardown_all(); + sa_teardown_all (); } /* diff --git a/sbin/isakmpd/x509.c b/sbin/isakmpd/x509.c index dc2a44ddb67..3a6a5888439 100644 --- a/sbin/isakmpd/x509.c +++ b/sbin/isakmpd/x509.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509.c,v 1.82 2003/06/10 16:41:29 deraadt Exp $ */ +/* $OpenBSD: x509.c,v 1.83 2003/11/06 16:12:08 ho Exp $ */ /* $EOM: x509.c,v 1.54 2001/01/16 18:42:16 ho Exp $ */ /* @@ -697,7 +697,7 @@ x509_read_from_dir (X509_STORE *ctx, char *name, int hash) { struct stat sb; - if (stat(fullname, &sb) == -1 || !(sb.st_mode & S_IFREG)) + if (stat (fullname, &sb) == -1 || !(sb.st_mode & S_IFREG)) continue; } @@ -805,7 +805,7 @@ x509_read_crls_from_dir (X509_STORE *ctx, char *name) { struct stat sb; - if (stat(fullname, &sb) == -1 || !(sb.st_mode & S_IFREG)) + if (stat (fullname, &sb) == -1 || !(sb.st_mode & S_IFREG)) continue; } diff --git a/sbin/isakmpd/x509.h b/sbin/isakmpd/x509.h index 9339086e250..c24e8c9c3d7 100644 --- a/sbin/isakmpd/x509.h +++ b/sbin/isakmpd/x509.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509.h,v 1.18 2003/06/04 07:31:17 ho Exp $ */ +/* $OpenBSD: x509.h,v 1.19 2003/11/06 16:12:08 ho Exp $ */ /* $EOM: x509.h,v 1.11 2000/09/28 12:53:27 niklas Exp $ */ /* @@ -82,7 +82,7 @@ char *x509_DN_string (u_int8_t *, size_t); int x509_cert_insert (int, void *); int x509_cert_subjectaltname (X509 *cert, u_char **, u_int *); X509 *x509_from_asn (u_char *, u_int); -int x509_generate_kn(int, X509 *); +int x509_generate_kn (int, X509 *); int x509_read_from_dir (X509_STORE *, char *, int); int x509_read_crls_from_dir (X509_STORE *, char *); |