diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-02-28 23:59:15 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-02-28 23:59:15 +0000 |
| commit | fd089231ba3f5470566f08edad4d1a83315b2e31 (patch) | |
| tree | c25c0249f41ba20e082119c5a1bf56db86fa662b /sbin | |
| parent | 7d1d5d175d8d99a41acf00a27da38a1b022457d1 (diff) | |
Merge with EOM 1.45
author: niklas
I must have been on drugs. X509 is not preshared key.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/ike_auth.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sbin/isakmpd/ike_auth.c b/sbin/isakmpd/ike_auth.c index 9ae7525212d..564b9c1d23d 100644 --- a/sbin/isakmpd/ike_auth.c +++ b/sbin/isakmpd/ike_auth.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ike_auth.c,v 1.22 2000/02/25 17:23:40 niklas Exp $ */ -/* $EOM: ike_auth.c,v 1.44 2000/02/20 19:58:37 niklas Exp $ */ +/* $OpenBSD: ike_auth.c,v 1.23 2000/02/28 23:59:14 niklas Exp $ */ +/* $EOM: ike_auth.c,v 1.45 2000/02/28 23:59:40 niklas Exp $ */ /* * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -629,7 +629,6 @@ rsa_sig_decode_hash (struct message *msg) static int pre_shared_encode_hash (struct message *msg) { -#ifdef USE_X509 struct exchange *exchange = msg->exchange; struct ipsec_exch *ie = exchange->data; size_t hashsize = ie->hash->hashsize; @@ -648,9 +647,6 @@ pre_shared_encode_hash (struct message *msg) initiator ? 'I' : 'R'); LOG_DBG_BUF ((LOG_MISC, 80, header, buf + ISAKMP_HASH_DATA_OFF, hashsize)); return 0; -#else - return -1; -#endif } /* Encrypt the HASH into a SIG type. */ |