Date: Sun, 19 Sep 1999 13:39:39 +0200 (SAST) From: Mark Murray <markm@internat.freebsd.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/libdes cbc3_enc.c des.c des.h des.org des_enc.c des_locl.h des_locl.org des_ver.h ecb_enc.c ede_enc.c enc_read.c enc_writ.c fcrypt.c rand_key.c read_pwd.c rnd_keys.c set_key.c spr.h str2key.c version.h src/crypto/libdes/asm ... Message-ID: <199909191139.NAA10579@internat.freebsd.org>
next in thread | raw e-mail | index | archive | help
markm 1999/09/19 13:39:39 SAST
FreeBSD International Crypto Repository
Modified files:
crypto/libdes cbc3_enc.c des.c des.h des.org des_enc.c
des_locl.h des_locl.org des_ver.h
ecb_enc.c ede_enc.c enc_read.c enc_writ.c
fcrypt.c rand_key.c read_pwd.c rnd_keys.c
set_key.c spr.h str2key.c version.h
crypto/libdes/asm dx86-cpp.s win32.asm
Log:
Resolve conflicts and make it compile.
Revision Changes Path
1.2 +16 -22 src/crypto/libdes/cbc3_enc.c
1.2 +59 -87 src/crypto/libdes/des.c
1.2 +140 -186 src/crypto/libdes/des.h
1.2 +5 -5 src/crypto/libdes/des.org
1.2 +137 -33 src/crypto/libdes/des_enc.c
1.2 +33 -168 src/crypto/libdes/des_locl.h
1.2 +5 -5 src/crypto/libdes/des_locl.org
1.2 +5 -5 src/crypto/libdes/des_ver.h
1.2 +16 -19 src/crypto/libdes/ecb_enc.c
1.2 +5 -5 src/crypto/libdes/ede_enc.c
1.4 +53 -42 src/crypto/libdes/enc_read.c
1.3 +38 -32 src/crypto/libdes/enc_writ.c
1.2 +64 -294 src/crypto/libdes/fcrypt.c
1.2 +17 -23 src/crypto/libdes/rand_key.c
1.2 +122 -104 src/crypto/libdes/read_pwd.c
1.4 +8 -71 src/crypto/libdes/rnd_keys.c
1.2 +20 -30 src/crypto/libdes/set_key.c
1.2 +5 -5 src/crypto/libdes/spr.h
1.2 +17 -25 src/crypto/libdes/str2key.c
1.2 +3 -3 src/crypto/libdes/version.h
1.2 +1 -1 src/crypto/libdes/asm/dx86-cpp.s
1.2 +1 -1 src/crypto/libdes/asm/win32.asm
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199909191139.NAA10579>