diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-11-16 12:20:34 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-11-16 12:20:34 +0000 |
| commit | 04443fbe56e28029b5d3b17ac6b223a2afef9358 (patch) | |
| tree | 0ab1077db6308a5946392e18a32cb438c176e084 | |
| parent | e7b1a21acb051df256368cf860c125653d011742 (diff) | |
Add back cert handling, no patent problem here
| -rw-r--r-- | sbin/isakmpd/exchange.c | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/message.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c index cc19e35f351..b3a0cd51219 100644 --- a/sbin/isakmpd/exchange.c +++ b/sbin/isakmpd/exchange.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exchange.c,v 1.4 1998/11/15 01:13:26 niklas Exp $ */ +/* $OpenBSD: exchange.c,v 1.5 1998/11/16 12:20:33 niklas Exp $ */ /* * Copyright (c) 1998 Niklas Hallqvist. All rights reserved. @@ -857,15 +857,12 @@ int exchange_save_certreq (struct message *msg) { struct payload *cp = TAILQ_FIRST (&msg->payload[ISAKMP_PAYLOAD_CERT_REQ]); -#if 0 struct exchange *exchange = msg->exchange; struct certreq_aca *tmp; -#endif for ( ; cp; cp = TAILQ_NEXT (cp, link)) { cp->flags |= PL_MARK; -#if 0 tmp = certreq_decode (GET_ISAKMP_CERTREQ_TYPE (cp->p), cp->p + ISAKMP_CERTREQ_AUTHORITY_OFF, GET_ISAKMP_GEN_LENGTH (cp->p) - @@ -873,7 +870,6 @@ exchange_save_certreq (struct message *msg) if (tmp == NULL) continue; TAILQ_INSERT_TAIL (&exchange->aca_list, tmp, link); -#endif } return 0; diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c index 0385170e3de..29e96ef5a11 100644 --- a/sbin/isakmpd/message.c +++ b/sbin/isakmpd/message.c @@ -1,4 +1,4 @@ -/* $OpenBSD: message.c,v 1.4 1998/11/15 01:13:27 niklas Exp $ */ +/* $OpenBSD: message.c,v 1.5 1998/11/16 12:20:33 niklas Exp $ */ /* * Copyright (c) 1998 Niklas Hallqvist. All rights reserved. @@ -350,10 +350,8 @@ message_validate_cert (struct message *msg, struct payload *p) static int message_validate_cert_req (struct message *msg, struct payload *p) { -#if 0 struct cert_handler *cert; size_t len = GET_ISAKMP_GEN_LENGTH (p->p)- ISAKMP_CERTREQ_AUTHORITY_OFF; -#endif if (GET_ISAKMP_CERTREQ_TYPE (p->p) >= ISAKMP_CERTENC_RESERVED_MIN) { @@ -365,7 +363,6 @@ message_validate_cert_req (struct message *msg, struct payload *p) * Check the certificate types we support and if an acceptable authority * is included in the payload check if it can be decoded */ -#if 0 if ((cert = cert_get (GET_ISAKMP_CERTREQ_TYPE (p->p))) == NULL || (len && !cert->certreq_validate (p->p + ISAKMP_CERTREQ_AUTHORITY_OFF, len))) @@ -373,7 +370,6 @@ message_validate_cert_req (struct message *msg, struct payload *p) message_drop (msg, ISAKMP_NOTIFY_CERT_TYPE_UNSUPPORTED, 0, 0, 1); return -1; } -#endif return 0; } |