From owner-cvs-all  Sun Sep 19  6: 4:56 1999
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id B4F4315553; Sun, 19 Sep 1999 06:04:53 -0700 (PDT)
	(envelope-from markm@FreeBSD.org)
Received: (from markm@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id GAA42511;
	Sun, 19 Sep 1999 06:04:53 -0700 (PDT)
	(envelope-from markm@FreeBSD.org)
Message-Id: <199909191304.GAA42511@freefall.freebsd.org>
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 19 Sep 1999 06:04:52 -0700 (PDT)
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 ...
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

markm       1999/09/19 06:04:50 PDT

  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:
  Big OpenSSL/KTH/FreeBSD merge, badly poisoned by $FreeBSD$'s.
  
  Revision  Changes    Path
  1.2       +18 -22    src/crypto/libdes/cbc3_enc.c
  1.2       +61 -87    src/crypto/libdes/des.c
  1.2       +142 -186  src/crypto/libdes/des.h
  1.2       +7 -5      src/crypto/libdes/des.org
  1.2       +139 -33   src/crypto/libdes/des_enc.c
  1.2       +35 -168   src/crypto/libdes/des_locl.h
  1.2       +7 -13     src/crypto/libdes/des_locl.org
  1.2       +7 -5      src/crypto/libdes/des_ver.h
  1.2       +18 -19    src/crypto/libdes/ecb_enc.c
  1.2       +7 -5      src/crypto/libdes/ede_enc.c
  1.3       +55 -42    src/crypto/libdes/enc_read.c
  1.3       +40 -32    src/crypto/libdes/enc_writ.c
  1.2       +66 -294   src/crypto/libdes/fcrypt.c
  1.2       +19 -23    src/crypto/libdes/rand_key.c
  1.2       +124 -104  src/crypto/libdes/read_pwd.c
  1.4       +9 -71     src/crypto/libdes/rnd_keys.c
  1.2       +22 -30    src/crypto/libdes/set_key.c
  1.2       +7 -5      src/crypto/libdes/spr.h
  1.2       +19 -25    src/crypto/libdes/str2key.c
  1.2       +5 -3      src/crypto/libdes/version.h
  1.2       +2 -1      src/crypto/libdes/asm/dx86-cpp.s
  1.2       +2 -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