summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/cipher.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge conflicts.des2006-09-301-3/+8
| | | | MFC after: 1 week
* Merge conflicts.des2006-03-221-2/+2
|
* Resolve conflicts.des2005-09-031-61/+41
|
* Resolve conflicts.des2005-06-051-4/+6
|
* Resolve conflictsdes2004-10-281-26/+26
|
* Resolve conflicts.des2004-02-261-10/+23
|
* Resolve conflicts and remove obsolete files.des2004-01-071-349/+33
| | | | Sponsored by: registrar.no
* Remove RCSID from files which have no other diffs to the vendor branch.des2003-05-011-1/+0
|
* Resolve conflicts.des2003-04-231-2/+2
|
* Resolve conflicts.des2002-10-291-2/+17
|
* Resolve conflicts.des2002-06-291-1/+14
| | | | Sponsored by: DARPA, NAI Labs
* Forcibly revert to mainline.des2002-06-271-1/+43
|
* Resolve conflicts. Known issues:des2002-06-231-11/+181
| | | | | | | | | | | - sshd fails to set TERM correctly. - privilege separation may break PAM and is currently turned off. - man pages have not yet been updated I will have these issues resolved, and privilege separation turned on by default, in time for DP2. Sponsored by: DARPA, NAI Labs
* Fix conflicts.des2002-03-181-386/+331
|
* Fix conflicts for OpenSSH 2.9.green2001-05-041-28/+18
|
* Update to OpenSSH 2.3.0 with FreeBSD modifications. OpenSSH 2.3.0green2000-12-051-333/+411
| | | | | | | | | | | | | | | | | new features description elided in favor of checking out their website. Important new FreeBSD-version stuff: PAM support has been worked in, partially from the "Unix" OpenSSH version, and a lot due to the work of Eivind Eklend, too. This requires at least the following in pam.conf: sshd auth sufficient pam_skey.so sshd auth required pam_unix.so try_first_pass sshd session required pam_permit.so Parts by: Eivind Eklend <eivind@FreeBSD.org>
* Resolve conflicts and update for OpenSSH 2.2.0kris2000-09-101-10/+34
| | | | Reviewed by: gshapiro, peter, green
* Resolve conflictskris2000-06-031-2/+4
|
* Resolve conflicts and update for FreeBSD.kris2000-05-151-22/+177
|
* Resolve conflicts.kris2000-03-261-15/+1
|
* The includes must be <openssl/.*\.h>, not <ssl/.*\.h>.green2000-02-251-1/+2
|
* Vendor import of OpenSSH.markm2000-02-241-0/+320
OpenPOWER on IntegriCloud