diff options
| -rw-r--r-- | sbin/isakmpd/exchange.c | 4 | ||||
| -rw-r--r-- | sbin/isakmpd/ike_auth.c | 34 | ||||
| -rw-r--r-- | sbin/isakmpd/ike_quick_mode.c | 4 | ||||
| -rw-r--r-- | sbin/isakmpd/policy.h | 4 | ||||
| -rw-r--r-- | sbin/isakmpd/sa.c | 6 |
5 files changed, 26 insertions, 26 deletions
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c index 9ccc93fcc24..8d5d041e7af 100644 --- a/sbin/isakmpd/exchange.c +++ b/sbin/isakmpd/exchange.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exchange.c,v 1.59 2001/08/11 05:27:36 angelos Exp $ */ +/* $OpenBSD: exchange.c,v 1.60 2001/08/15 13:06:53 ho Exp $ */ /* $EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $ */ /* @@ -1208,7 +1208,7 @@ exchange_free_aux (void *v_exch) if (exchange->keynote_key) free (exchange->keynote_key); /* This is just a string */ -#if defined(POLICY) || defined(KEYNOTE) +#if defined (POLICY) || defined (KEYNOTE) if (exchange->policy_id != -1) LK (kn_close, (exchange->policy_id)); #endif diff --git a/sbin/isakmpd/ike_auth.c b/sbin/isakmpd/ike_auth.c index e9e6aa592a1..5f6c2a81231 100644 --- a/sbin/isakmpd/ike_auth.c +++ b/sbin/isakmpd/ike_auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ike_auth.c,v 1.53 2001/08/15 09:16:29 ho Exp $ */ +/* $OpenBSD: ike_auth.c,v 1.54 2001/08/15 13:06:53 ho Exp $ */ /* $EOM: ike_auth.c,v 1.59 2000/11/21 00:21:31 angelos Exp $ */ /* @@ -46,7 +46,7 @@ #include <stdlib.h> #include <string.h> #include <regex.h> -#if defined(USE_KEYNOTE) +#if defined (USE_KEYNOTE) #include <keynote.h> #endif #include <policy.h> @@ -56,7 +56,7 @@ #include "cert.h" #include "conf.h" #include "constants.h" -#if defined(USE_DNSSEC) +#if defined (USE_DNSSEC) #include "dnssec.h" #endif #include "exchange.h" @@ -84,7 +84,7 @@ static u_int8_t *pre_shared_gen_skeyid (struct exchange *, size_t *); static int pre_shared_decode_hash (struct message *); static int pre_shared_encode_hash (struct message *); -#if defined(USE_X509) || defined(USE_KEYNOTE) +#if defined (USE_X509) || defined (USE_KEYNOTE) static u_int8_t *sig_gen_skeyid (struct exchange *, size_t *); static int rsa_sig_decode_hash (struct message *); static int rsa_sig_encode_hash (struct message *); @@ -108,7 +108,7 @@ static struct ike_auth ike_auth[] = { pre_shared_encode_hash }, #endif -#if defined(USE_X509) || defined(USE_KEYNOTE) +#if defined (USE_X509) || defined (USE_KEYNOTE) { IKE_AUTH_RSA_SIG, sig_gen_skeyid, rsa_sig_decode_hash, rsa_sig_encode_hash @@ -145,9 +145,9 @@ static void * ike_auth_get_key (int type, char *id, char *local_id, size_t *keylen) { char *key, *buf; -#if defined(USE_X509) || defined(USE_KEYNOTE) +#if defined (USE_X509) || defined (USE_KEYNOTE) char *keyfile; -#if defined(USE_X509) +#if defined (USE_X509) BIO *keyh; RSA *rsakey; #endif @@ -192,12 +192,12 @@ ike_auth_get_key (int type, char *id, char *local_id, size_t *keylen) break; case IKE_AUTH_RSA_SIG: -#if defined(USE_X509) || defined(USE_KEYNOTE) +#if defined (USE_X509) || defined (USE_KEYNOTE) #ifdef HAVE_DLOPEN if (!libcrypto) return 0; #endif -#if defined(USE_KEYNOTE) +#if defined (USE_KEYNOTE) if (local_id && (keyfile = conf_get_str ("KeyNote", "Credential-directory")) != 0) { @@ -429,7 +429,7 @@ pre_shared_gen_skeyid (struct exchange *exchange, size_t *sz) return skeyid; } -#if defined(USE_X509) || defined(USE_KEYNOTE) +#if defined (USE_X509) || defined (USE_KEYNOTE) /* Both DSS & RSA signature authentication use this algorithm. */ static u_int8_t * sig_gen_skeyid (struct exchange *exchange, size_t *sz) @@ -561,7 +561,7 @@ pre_shared_decode_hash (struct message *msg) return 0; } -#if defined(USE_X509) || defined(USE_KEYNOTE) +#if defined (USE_X509) || defined (USE_KEYNOTE) /* Decrypt the HASH in SIG, we already need a parsed ID payload. */ static int rsa_sig_decode_hash (struct message *msg) @@ -582,7 +582,7 @@ rsa_sig_decode_hash (struct message *msg) u_int32_t *id_cert_len; size_t id_len; int found = 0, n, i, id_found; -#if defined(USE_DNSSEC) +#if defined (USE_DNSSEC) u_int8_t *rawkey = 0; u_int32_t rawkeylen; #endif @@ -614,7 +614,7 @@ rsa_sig_decode_hash (struct message *msg) return -1; } -#if defined(USE_POLICY) || defined(USE_KEYNOTE) +#if defined (USE_POLICY) || defined (USE_KEYNOTE) /* * We need the policy session initialized now, so we can add * credentials etc. @@ -652,7 +652,7 @@ rsa_sig_decode_hash (struct message *msg) handler->id)); exchange->recv_cert = cert; exchange->recv_certtype = handler->id; -#if defined(USE_POLICY) +#if defined (USE_POLICY) x509_generate_kn (exchange->policy_id, cert); #endif /* USE_POLICY */ } @@ -745,7 +745,7 @@ rsa_sig_decode_hash (struct message *msg) exchange->recv_cert = cert; exchange->recv_certtype = GET_ISAKMP_CERT_ENCODING (p->p); -#if defined(USE_POLICY) || defined(USE_KEYNOTE) +#if defined (USE_POLICY) || defined (USE_KEYNOTE) if (exchange->recv_certtype == ISAKMP_CERTENC_KEYNOTE) { struct keynote_deckey dc; @@ -782,7 +782,7 @@ rsa_sig_decode_hash (struct message *msg) found++; } -#if defined(USE_DNSSEC) +#if defined (USE_DNSSEC) /* If no certificate provided a key, try to find a validated DNSSEC KEY. */ if (!found) { @@ -893,7 +893,7 @@ pre_shared_encode_hash (struct message *msg) return 0; } -#if defined(USE_X509) || defined(USE_KEYNOTE) +#if defined (USE_X509) || defined (USE_KEYNOTE) /* Encrypt the HASH into a SIG type. */ static int rsa_sig_encode_hash (struct message *msg) diff --git a/sbin/isakmpd/ike_quick_mode.c b/sbin/isakmpd/ike_quick_mode.c index e6786e250e7..235e79632ad 100644 --- a/sbin/isakmpd/ike_quick_mode.c +++ b/sbin/isakmpd/ike_quick_mode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ike_quick_mode.c,v 1.53 2001/07/01 20:11:53 niklas Exp $ */ +/* $OpenBSD: ike_quick_mode.c,v 1.54 2001/08/15 13:06:53 ho Exp $ */ /* $EOM: ike_quick_mode.c,v 1.139 2001/01/26 10:43:17 niklas Exp $ */ /* @@ -39,7 +39,7 @@ #include <stdlib.h> #include <string.h> -#if defined(USE_POLICY) || defined(USE_KEYNOTE) +#if defined (USE_POLICY) || defined (USE_KEYNOTE) #include <sys/types.h> #include <regex.h> #include <keynote.h> diff --git a/sbin/isakmpd/policy.h b/sbin/isakmpd/policy.h index 3cd005fee27..88b35aa7f36 100644 --- a/sbin/isakmpd/policy.h +++ b/sbin/isakmpd/policy.h @@ -1,4 +1,4 @@ -/* $OpenBSD: policy.h,v 1.8 2001/05/31 20:21:08 angelos Exp $ */ +/* $OpenBSD: policy.h,v 1.9 2001/08/15 13:06:53 ho Exp $ */ /* $EOM: policy.h,v 1.12 2000/09/28 12:53:27 niklas Exp $ */ /* @@ -56,7 +56,7 @@ #define LKV(sym) !!libkeynote called but no USE_KEYNOTE nor HAVE_DLOPEN!! #endif -#if defined(HAVE_DLOPEN) && !defined(USE_KEYNOTE) && 0 +#if defined (HAVE_DLOPEN) && !defined (USE_KEYNOTE) && 0 struct keynote_deckey; extern void *libkeynote; diff --git a/sbin/isakmpd/sa.c b/sbin/isakmpd/sa.c index df5e039fbb8..66b4ed1bc02 100644 --- a/sbin/isakmpd/sa.c +++ b/sbin/isakmpd/sa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sa.c,v 1.47 2001/07/05 12:36:55 ho Exp $ */ +/* $OpenBSD: sa.c,v 1.48 2001/08/15 13:06:53 ho Exp $ */ /* $EOM: sa.c,v 1.112 2000/12/12 00:22:52 niklas Exp $ */ /* @@ -39,7 +39,7 @@ #include <stdlib.h> #include <string.h> -#if defined(USE_KEYNOTE) || defined(USE_POLICY) +#if defined (USE_KEYNOTE) || defined (USE_POLICY) #include <regex.h> #include <keynote.h> #endif /* USE_KEYNOTE || USE_POLICY */ @@ -574,7 +574,7 @@ sa_release (struct sa *sa) key_free (sa->sent_keytype, ISAKMP_KEYTYPE_PRIVATE, sa->sent_key); if (sa->keynote_key) free (sa->keynote_key); /* This is just a string */ -#if defined(USE_POLICY) || defined(USE_KEYNOTE) +#if defined (USE_POLICY) || defined (USE_KEYNOTE) if (sa->policy_id != -1) LK (kn_close, (sa->policy_id)); #endif |