CVS commit: cryptosrc-us

[Jason R Thorpe <thorpej%netbsd.org@localhost>]

Module Name:    cryptosrc-us
Committed By:   thorpej
Date:           Thu Feb 10 19:02:15 UTC 2000

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

Log Message:
Import latest kernel IPSEC bits from netbsd-cryptosrc-intl.

Status:

Vendor Tag:     netbsd-cryptosrc-intl
Release Tags:   cryptosrc-intl-20000210
                
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
U cryptosrc-us/crypto-us/sys/crypto/blowfish/bf_cbc.c
U cryptosrc-us/crypto-us/sys/crypto/blowfish/bf_cbc_m.c
U cryptosrc-us/crypto-us/sys/crypto/blowfish/bf_enc.c
U cryptosrc-us/crypto-us/sys/crypto/blowfish/bf_locl.h
U cryptosrc-us/crypto-us/sys/crypto/blowfish/bf_pi.h
U cryptosrc-us/crypto-us/sys/crypto/blowfish/bf_skey.c
U cryptosrc-us/crypto-us/sys/crypto/blowfish/blowfish.h
U cryptosrc-us/crypto-us/sys/crypto/cast128/cast128.c
U cryptosrc-us/crypto-us/sys/crypto/cast128/cast128.h
U cryptosrc-us/crypto-us/sys/crypto/cast128/cast128_cbc.c
U cryptosrc-us/crypto-us/sys/crypto/cast128/cast128_subkey.h
U cryptosrc-us/crypto-us/sys/crypto/des/des_3cbc.c
U cryptosrc-us/crypto-us/sys/crypto/des/des.h
U cryptosrc-us/crypto-us/sys/crypto/des/des_cbc.c
U cryptosrc-us/crypto-us/sys/crypto/des/des_ecb.c
U cryptosrc-us/crypto-us/sys/crypto/des/des_locl.h
U cryptosrc-us/crypto-us/sys/crypto/des/des_setkey.c
U cryptosrc-us/crypto-us/sys/crypto/des/podd.h
U cryptosrc-us/crypto-us/sys/crypto/des/sk.h
U cryptosrc-us/crypto-us/sys/crypto/des/spr.h

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