diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-05-02 19:16:42 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-05-02 19:16:42 +0000 |
| commit | 86ebff963ff022d29e30f62dbea042cc455dc9fc (patch) | |
| tree | 4520810c12d7934cd41725a34ecee9d42f4333cc | |
| parent | eb6dc337ff9fac81ff49af5a24e6d3a593ae1cd7 (diff) | |
ike_phase_1.c: Merge with EOM 1.4
prf.c: Merge with EOM 1.7
author: niklas
Remove bogus XXXes, add allocation error reporting.
| -rw-r--r-- | sbin/isakmpd/ike_phase_1.c | 5 | ||||
| -rw-r--r-- | sbin/isakmpd/prf.c | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sbin/isakmpd/ike_phase_1.c b/sbin/isakmpd/ike_phase_1.c index 67bec8f1338..87d72b6f7eb 100644 --- a/sbin/isakmpd/ike_phase_1.c +++ b/sbin/isakmpd/ike_phase_1.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ike_phase_1.c,v 1.2 1999/04/30 11:46:23 niklas Exp $ */ -/* $EOM: ike_phase_1.c,v 1.3 1999/04/29 10:51:36 niklas Exp $ */ +/* $OpenBSD: ike_phase_1.c,v 1.3 1999/05/02 19:16:41 niklas Exp $ */ +/* $EOM: ike_phase_1.c,v 1.4 1999/05/02 12:50:27 niklas Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. @@ -617,7 +617,6 @@ ike_phase_1_post_exchange_KE_NONCE (struct message *msg) ie->skeyid_a = malloc (ie->skeyid_len); if (!ie->skeyid_a) { - /* XXX How to notify peer? */ log_error ("ike_phase_1_post_exchange_KE_NONCE: malloc (%d) failed", ie->skeyid_len); prf_free (prf); diff --git a/sbin/isakmpd/prf.c b/sbin/isakmpd/prf.c index a940343fb3f..51551e22bf4 100644 --- a/sbin/isakmpd/prf.c +++ b/sbin/isakmpd/prf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: prf.c,v 1.6 1999/04/19 19:54:54 niklas Exp $ */ -/* $EOM: prf.c,v 1.6 1999/04/02 00:58:06 niklas Exp $ */ +/* $OpenBSD: prf.c,v 1.7 1999/05/02 19:16:41 niklas Exp $ */ +/* $EOM: prf.c,v 1.7 1999/05/02 12:50:29 niklas Exp $ */ /* * Copyright (c) 1998 Niels Provos. All rights reserved. @@ -87,7 +87,10 @@ prf_alloc (enum prfs type, int subtype, char *shared, int sharedsize) case PRF_HMAC: hash = hash_get (subtype); if (!hash) - return 0; + { + log_print ("prf_alloc: unknown hash type %d", subtype); + return 0; + } break; default: log_print ("prf_alloc: unknown PRF type %d", type); |