Module Name:	cryptosrc-us
Committed By:	thorpej
Date:		Mon Aug  2 18:41:59 UTC 1999

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

Log Message:
Update IPsec code from cryptosrc-intl.


Vendor Tag:	netbsd-cryptosrc-intl
Release Tags:	cryptosrc-intl-19990802
		
C cryptosrc-us/crypto-us/sys/netinet6/esp_core.c
C cryptosrc-us/crypto-us/sys/netinet6/esp_input.c
C cryptosrc-us/crypto-us/sys/netinet6/esp_output.c
C cryptosrc-us/crypto-us/sys/crypto/blowfish/bf_cbc.c
C cryptosrc-us/crypto-us/sys/crypto/blowfish/bf_cbc_m.c
C cryptosrc-us/crypto-us/sys/crypto/blowfish/bf_enc.c
C cryptosrc-us/crypto-us/sys/crypto/blowfish/bf_locl.h
C cryptosrc-us/crypto-us/sys/crypto/blowfish/bf_pi.h
C cryptosrc-us/crypto-us/sys/crypto/blowfish/bf_skey.c
C cryptosrc-us/crypto-us/sys/crypto/blowfish/blowfish.h
C cryptosrc-us/crypto-us/sys/crypto/cast128/cast128.c
C cryptosrc-us/crypto-us/sys/crypto/cast128/cast128.h
C cryptosrc-us/crypto-us/sys/crypto/cast128/cast128_cbc.c
C cryptosrc-us/crypto-us/sys/crypto/cast128/cast128_subkey.h
C cryptosrc-us/crypto-us/sys/crypto/des/des_3cbc.c
C cryptosrc-us/crypto-us/sys/crypto/des/des.h
C cryptosrc-us/crypto-us/sys/crypto/des/des_cbc.c
C cryptosrc-us/crypto-us/sys/crypto/des/des_ecb.c
C cryptosrc-us/crypto-us/sys/crypto/des/des_locl.h
C cryptosrc-us/crypto-us/sys/crypto/des/des_setkey.c
C cryptosrc-us/crypto-us/sys/crypto/des/podd.h
C cryptosrc-us/crypto-us/sys/crypto/des/sk.h
C cryptosrc-us/crypto-us/sys/crypto/des/spr.h

23 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