diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-11-17 04:53:58 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-11-17 04:53:58 +0000 |
| commit | fc279f91d006df8cfd2c272550e34653cbab3131 (patch) | |
| tree | 1ad8935f71fdc646dbf37aa9254e2da360f7907d | |
| parent | 9eb58fb6d0452bcb35ceb7326fb7f24f71bea75d (diff) | |
HMAC96->HMAC as needed.
| -rw-r--r-- | sbin/isakmpd/pf_key_v2.c | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c index 5bb305c5105..ee80d81260d 100644 --- a/sbin/isakmpd/pf_key_v2.c +++ b/sbin/isakmpd/pf_key_v2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_key_v2.c,v 1.34 2000/10/30 16:04:00 angelos Exp $ */ +/* $OpenBSD: pf_key_v2.c,v 1.35 2000/11/17 04:53:57 angelos Exp $ */ /* $EOM: pf_key_v2.c,v 1.59 2000/10/16 18:16:59 provos Exp $ */ /* @@ -798,24 +798,28 @@ pf_key_v2_set_spi (struct sa *sa, struct proto *proto, int incoming) switch (iproto->auth) { case IPSEC_AUTH_HMAC_MD5: -#ifdef KAME - ssa.sadb_sa_auth = SADB_AALG_MD5HMAC; -#else +#ifdef SADB_AALG_MD5HMAC96 ssa.sadb_sa_auth = SADB_AALG_MD5HMAC96; +#else + ssa.sadb_sa_auth = SADB_AALG_MD5HMAC; #endif break; case IPSEC_AUTH_HMAC_SHA: -#ifdef KAME - ssa.sadb_sa_auth = SADB_AALG_SHA1HMAC; -#else +#ifdef SADB_AALG_SHA1HMAC96 ssa.sadb_sa_auth = SADB_AALG_SHA1HMAC96; +#else + ssa.sadb_sa_auth = SADB_AALG_SHA1HMAC; #endif break; #ifndef KAME case IPSEC_AUTH_HMAC_RIPEMD: +#ifdef SADB_X_AALG_RIPEMD160HMAC96 ssa.sadb_sa_auth = SADB_X_AALG_RIPEMD160HMAC96; +#else + ssa.sadb_sa_auth = SADB_X_AALG_RIPEMD160HMAC; +#endif break; #endif @@ -839,24 +843,28 @@ pf_key_v2_set_spi (struct sa *sa, struct proto *proto, int incoming) switch (proto->id) { case IPSEC_AH_MD5: -#ifdef KAME - ssa.sadb_sa_auth = SADB_AALG_MD5HMAC; -#else +#ifdef SADB_AALG_MD5HMAC96 ssa.sadb_sa_auth = SADB_AALG_MD5HMAC96; +#else + ssa.sadb_sa_auth = SADB_AALG_MD5HMAC; #endif break; case IPSEC_AH_SHA: -#ifdef KAME - ssa.sadb_sa_auth = SADB_AALG_SHA1HMAC; -#else +#ifdef SADB_AALG_SHA1HMAC96 ssa.sadb_sa_auth = SADB_AALG_SHA1HMAC96; +#else + ssa.sadb_sa_auth = SADB_AALG_SHA1HMAC; #endif break; #ifndef KAME case IPSEC_AH_RIPEMD: +#ifdef SADB_X_AALG_RIPEMD160HMAC96 ssa.sadb_sa_auth = SADB_X_AALG_RIPEMD160HMAC96; +#else + ssa.sadb_sa_auth = SADB_X_AALG_RIPEMD160HMAC; +#endif break; #endif |