diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 18:35:38 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 18:35:38 +0000 |
| commit | 3950698deba5e728155bfdbd0659b660e8910bb4 (patch) | |
| tree | cfa39778eba9c922b169323968463b655228b82d | |
| parent | ad5c4edceea870a8911922eaa58a16d17adde523 (diff) | |
zap USE_RAWKEY
| -rw-r--r-- | sbin/isakmpd/ike_auth.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sbin/isakmpd/ike_auth.c b/sbin/isakmpd/ike_auth.c index 599a24ca3ad..4d0557b5f7a 100644 --- a/sbin/isakmpd/ike_auth.c +++ b/sbin/isakmpd/ike_auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ike_auth.c,v 1.99 2005/04/08 17:15:01 deraadt Exp $ */ +/* $OpenBSD: ike_auth.c,v 1.100 2005/04/08 18:35:37 deraadt Exp $ */ /* $EOM: ike_auth.c,v 1.59 2000/11/21 00:21:31 angelos Exp $ */ /* @@ -82,9 +82,7 @@ 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 *); -#if defined (USE_RAWKEY) static int get_raw_key_from_file(int, u_int8_t *, size_t, RSA **); -#endif static int ike_auth_hash(struct exchange *, u_int8_t *); @@ -739,13 +737,11 @@ rsa_sig_decode_hash(struct message *msg) } #endif /* USE_DNSSEC */ -#if defined (USE_RAWKEY) /* If we still have not found a key, try to read it from a file. */ if (!found) if (get_raw_key_from_file(IKE_AUTH_RSA_SIG, id, id_len, &key) != -1) found++; -#endif if (!found) { log_print("rsa_sig_decode_hash: no public key found"); @@ -1086,7 +1082,6 @@ ike_auth_hash(struct exchange *exchange, u_int8_t *buf) return 0; } -#if defined (USE_RAWKEY) static int get_raw_key_from_file(int type, u_int8_t *id, size_t id_len, RSA **rsa) { @@ -1136,4 +1131,3 @@ get_raw_key_from_file(int type, u_int8_t *id, size_t id_len, RSA **rsa) return (*rsa ? 0 : -1); } -#endif /* USE_RAWKEY */ |