summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-06-07 04:45:43 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-06-07 04:45:43 +0000
commitba03a212376f5be0a3f0952b1aade4421a7e59ab (patch)
tree1cb7eab515d0c121f17ed7a4ed244eff44ccef9e
parent44f45a912d101b58993feea2e5cd10b1c69d6943 (diff)
Get rid of useless x509_policy_asserts[]
-rw-r--r--sbin/isakmpd/ike_quick_mode.c27
1 files changed, 1 insertions, 26 deletions
diff --git a/sbin/isakmpd/ike_quick_mode.c b/sbin/isakmpd/ike_quick_mode.c
index e6796cc6ded..45b5f1c61eb 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.48 2001/05/31 20:27:50 angelos Exp $ */
+/* $OpenBSD: ike_quick_mode.c,v 1.49 2001/06/07 04:45:42 angelos Exp $ */
/* $EOM: ike_quick_mode.c,v 1.139 2001/01/26 10:43:17 niklas Exp $ */
/*
@@ -153,19 +153,6 @@ check_policy (struct exchange *exchange, struct sa *sa, struct sa *isakmp_sa)
}
}
- if (x509_policy_asserts_num)
- {
- x509_ids = calloc (x509_policy_asserts_num, sizeof *x509_ids);
- if (!x509_ids)
- {
- log_error ("check_policy: "
- "failed to allocate %d bytes for book keeping",
- x509_policy_asserts_num * sizeof *x509_ids);
- free (keynote_ids);
- return 0;
- }
- }
-
/* Add the policy assertions */
for (i = 0; i < keynote_policy_asserts_num; i++)
keynote_ids[i] = LK (kn_add_assertion, (isakmp_sa->policy_id,
@@ -173,12 +160,6 @@ check_policy (struct exchange *exchange, struct sa *sa, struct sa *isakmp_sa)
strlen (keynote_policy_asserts[i]),
ASSERT_FLAG_LOCAL));
- for (i = 0; i < x509_policy_asserts_num; i++)
- x509_ids[i] = LK (kn_add_assertion, (isakmp_sa->policy_id,
- x509_policy_asserts[i],
- strlen (x509_policy_asserts[i]),
- ASSERT_FLAG_LOCAL));
-
/* Initialize -- we'll let the callback do all the work. */
policy_exchange = exchange;
policy_sa = sa;
@@ -419,12 +400,6 @@ check_policy (struct exchange *exchange, struct sa *sa, struct sa *isakmp_sa)
LK (kn_remove_assertion, (isakmp_sa->policy_id, keynote_ids[i]));
}
- for (i = 0; i < x509_policy_asserts_num; i++)
- {
- if (x509_ids[i] != -1)
- LK (kn_remove_assertion, (isakmp_sa->policy_id, x509_ids[i]));
- }
-
if (keynote_ids)
free (keynote_ids);