From owner-cvs-all  Sat Apr  1 20:28:40 2000
Delivered-To: cvs-all@freebsd.org
Received: from internat.freebsd.org (internat.freebsd.org [146.64.8.4])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1F4A337BDE0; Sat,  1 Apr 2000 20:28:30 -0800 (PST)
	(envelope-from peter@internat.freebsd.org)
Received: (from peter@localhost)
	by internat.freebsd.org (8.9.3/8.9.3) id GAA99126;
	Sun, 2 Apr 2000 06:28:24 +0200 (SAST)
	(envelope-from peter)
Message-Id: <200004020428.GAA99126@internat.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Sun, 2 Apr 2000 06:28:24 +0200 (SAST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/openssh auth-krb4.c auth-rh-rsa.c
         auth-rsa.c bufaux.c cipher.c cipher.h fingerprint.c hostfile.c
         key.c packet.h rsa.c servconf.c ssh-agent.c ssh.1 ssh.c ssh.h
         sshconnect.c sshd.8 sshd.c
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

peter       2000/04/02 06:28:24 SAST

FreeBSD International Crypto Repository

  Modified files:
    crypto/openssh       auth-krb4.c auth-rh-rsa.c auth-rsa.c 
                         bufaux.c cipher.c cipher.h fingerprint.c 
                         hostfile.c key.c packet.h rsa.c 
                         servconf.c ssh-agent.c ssh.1 ssh.c ssh.h 
                         sshconnect.c sshd.8 sshd.c 
  Log:
  Combined commit: Merge conflicts, change #include <ssh/*> to <openssl/*>
  
  Revision  Changes    Path
  1.3       +7 -6      src/crypto/openssh/auth-krb4.c
  1.2       +25 -16    src/crypto/openssh/auth-rh-rsa.c
  1.3       +16 -23    src/crypto/openssh/auth-rsa.c
  1.3       +5 -5      src/crypto/openssh/bufaux.c
  1.3       +2 -16     src/crypto/openssh/cipher.c
  1.3       +2 -8      src/crypto/openssh/cipher.h
  1.3       +3 -3      src/crypto/openssh/fingerprint.c
  1.2       +50 -144   src/crypto/openssh/hostfile.c
  1.2       +5 -3      src/crypto/openssh/key.c
  1.3       +4 -4      src/crypto/openssh/packet.h
  1.3       +5 -5      src/crypto/openssh/rsa.c
  1.5       +3 -3      src/crypto/openssh/servconf.c
  1.3       +6 -5      src/crypto/openssh/ssh-agent.c
  1.6       +312 -217  src/crypto/openssh/ssh.1
  1.5       +7 -8      src/crypto/openssh/ssh.c
  1.6       +4 -34     src/crypto/openssh/ssh.h
  1.5       +47 -47    src/crypto/openssh/sshconnect.c
  1.7       +234 -153  src/crypto/openssh/sshd.8
  1.7       +44 -24    src/crypto/openssh/sshd.c



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message