Subject: CVS commit: cryptosrc-us
To: None <>
From: Jason R Thorpe <>
List: source-changes
Date: 01/31/2000 11:09:42
Module Name:	cryptosrc-us
Committed By:	thorpej
Date:		Mon Jan 31 19:09:42 UTC 2000

Update of /cvsroot/cryptosrc-us/crypto-us/sys/netinet6
In directory nb00:/tmp/cvs-serv11261

Log Message:
Import the latest IPSEC ESP from cryotosrc-intl.

Vendor Tag:	netbsd-cryptosrc-intl
Release Tags:	cryptosrc-intl-20000131
C cryptosrc-us/crypto-us/sys/netinet6/esp_output.c
C cryptosrc-us/crypto-us/sys/netinet6/esp_input.c
C cryptosrc-us/crypto-us/sys/netinet6/esp_core.c

3 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jnetbsd-cryptosrc-intl:yesterday -jnetbsd-cryptosrc-intl cryptosrc-us/crypto-us/sys/netinet6