ipsec_num.cst: Merge with EOM 1.5

isakmpd.policy.5: Merge with EOM 1.22

author: angelos
Add RIPEMD negotiation/configuration.

2 files changed, 14 insertions, 6 deletions

diff --git a/sbin/isakmpd/ipsec_num.cst b/sbin/isakmpd/ipsec_num.cst
index 8dee8ca79bc..8b00cceb2b3 100644
--- a/sbin/isakmpd/ipsec_num.cst
+++ b/sbin/isakmpd/ipsec_num.cst
@@ -1,5 +1,5 @@
-#	$OpenBSD: ipsec_num.cst,v 1.6 2000/10/09 23:27:31 niklas Exp $
-#	$EOM: ipsec_num.cst,v 1.4 2000/10/09 22:08:29 angelos Exp $
+#	$OpenBSD: ipsec_num.cst,v 1.7 2000/10/16 23:27:55 niklas Exp $
+#	$EOM: ipsec_num.cst,v 1.5 2000/10/13 17:56:52 angelos Exp $
 
 #
 # Copyright (c) 1998 Niklas Hallqvist.  All rights reserved.
@@ -73,6 +73,10 @@ IPSEC_AUTH
   HMAC_SHA				2
   DES_MAC				3
   KPDK					4
+  HMAC_SHA2_256                         5
+  HMAC_SHA2_384                         6
+  HMAC_SHA2_512                         7
+  HMAC_RIPEMD                           8
 .
 
 # IPSEC ID types.
@@ -195,6 +199,7 @@ IPSEC_AH
   SHA2_256                              5
   SHA2_384                              6
   SHA2_512                              7
+  RIPEMD                                8
 .
 
 # IPSEC ESP transform IDs.
diff --git a/sbin/isakmpd/isakmpd.policy.5 b/sbin/isakmpd/isakmpd.policy.5
index db8e3e6ea0f..d5de7069823 100644
--- a/sbin/isakmpd/isakmpd.policy.5
+++ b/sbin/isakmpd/isakmpd.policy.5
@@ -1,5 +1,5 @@
-.\" $OpenBSD: isakmpd.policy.5,v 1.12 2000/10/09 23:27:31 niklas Exp $
-.\" $EOM: isakmpd.policy.5,v 1.21 2000/10/09 22:08:29 angelos Exp $
+.\" $OpenBSD: isakmpd.policy.5,v 1.13 2000/10/16 23:27:55 niklas Exp $
+.\" $EOM: isakmpd.policy.5,v 1.22 2000/10/13 17:56:52 angelos Exp $
 .\"
 .\" Copyright (c) 1999, Angelos D. Keromytis.  All rights reserved.
 .\"
@@ -300,6 +300,7 @@ otherwise.
 One of
 .Va md5 ,
 .Va sha ,
+.Va ripemd ,
 or
 .Va des ,
 based on the hash algorithm specified in the AH proposal.
@@ -335,16 +336,18 @@ One of
 .Va hmac-md5 ,
 .Va hmac-sha ,
 .Va des-mac ,
-or
 .Va kpdk ,
+or
+.Va hmac-ripemd .
 based on the authentication method specified in the AH proposal.
 .It esp_auth_alg
 One of
 .Va hmac-md5 ,
 .Va hmac-sha ,
 .Va des-mac ,
-or
 .Va kpdk ,
+or
+.Va hmac-ripemd
 based on the authentication method specified in the ESP proposal.
 .It ah_life_seconds, esp_life_seconds, comp_life_seconds
 Set to the lifetime of the AH, ESP, and compression proposal, in