summaryrefslogtreecommitdiff
path: root/cipher.c
Commit message (Collapse)AuthorAgeFilesLines
* - markus@cvs.openbsd.org 2009/01/26 09:58:15Damien Miller2009-01-281-21/+28
| | | | | | | | [cipher.c cipher.h packet.c] Work around the CPNI-957037 Plaintext Recovery Attack by always reading 256K of data on packet size or HMAC errors (in CBC mode only). Help, feedback and ok djm@ Feedback from Martin Albrecht and Paterson Kenny
* - deraadt@cvs.openbsd.org 2006/08/03 03:34:42Damien Miller2006-08-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [OVERVIEW atomicio.c atomicio.h auth-bsdauth.c auth-chall.c auth-krb5.c] [auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c] [auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-gss.c] [auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c ] [auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c bufaux.c bufbn.c] [buffer.c buffer.h canohost.c channels.c channels.h cipher-3des1.c] [cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c] [compress.c deattack.c dh.c dispatch.c dns.c dns.h fatal.c groupaccess.c] [groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c] [kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c] [key.h log.c log.h mac.c match.c md-sha256.c misc.c misc.h moduli.c] [monitor.c monitor_fdpass.c monitor_mm.c monitor_mm.h monitor_wrap.c] [monitor_wrap.h msg.c nchan.c packet.c progressmeter.c readconf.c] [readconf.h readpass.c rsa.c scard.c scard.h scp.c servconf.c servconf.h] [serverloop.c session.c session.h sftp-client.c sftp-common.c] [sftp-common.h sftp-glob.c sftp-server.c sftp.c ssh-add.c ssh-agent.c] [ssh-dss.c ssh-gss.h ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rsa.c] [ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c] [sshd.c sshlogin.c sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c] [uidswap.c uidswap.h uuencode.c uuencode.h xmalloc.c xmalloc.h] [loginrec.c loginrec.h openbsd-compat/port-aix.c openbsd-compat/port-tun.h] almost entirely get rid of the culture of ".h files that include .h files" ok djm, sort of ok stevesk makes the pain stop in one easy step NB. portable commit contains everything *except* removing includes.h, as that will take a fair bit more work as we move headers that are required for portability workarounds to defines.h. (also, this step wasn't "easy")
* - stevesk@cvs.openbsd.org 2006/07/22 20:48:23Damien Miller2006-07-241-3/+5
| | | | | | | | | | | | | | | | | [atomicio.c auth-options.c auth-passwd.c auth-rhosts.c auth-rsa.c] [auth.c auth1.c auth2-chall.c auth2-hostbased.c auth2-passwd.c auth2.c] [authfd.c authfile.c bufaux.c bufbn.c buffer.c canohost.c channels.c] [cipher-3des1.c cipher-bf1.c cipher-ctr.c cipher.c clientloop.c] [compat.c deattack.c dh.c dns.c gss-genr.c gss-serv.c hostfile.c] [includes.h kex.c kexdhc.c kexdhs.c kexgexc.c kexgexs.c key.c log.c] [mac.c match.c md-sha256.c misc.c moduli.c monitor.c monitor_fdpass.c] [monitor_mm.c monitor_wrap.c msg.c nchan.c packet.c rsa.c] [progressmeter.c readconf.c readpass.c scp.c servconf.c serverloop.c] [session.c sftp-client.c sftp-common.c sftp-glob.c sftp-server.c sftp.c] [ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c] [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c sshconnect2.c] [sshd.c sshlogin.c sshpty.c ttymodes.c uidswap.c xmalloc.c] move #include <string.h> out of includes.h
* - djm@cvs.openbsd.org 2006/03/25 13:17:03Damien Miller2006-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | | [atomicio.c auth-bsdauth.c auth-chall.c auth-options.c auth-passwd.c] [auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth-skey.c auth.c auth1.c] [auth2-chall.c auth2-hostbased.c auth2-kbdint.c auth2-none.c] [auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfile.c bufaux.c] [buffer.c canohost.c channels.c cipher-3des1.c cipher-bf1.c] [cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c compress.c] [deattack.c dh.c dispatch.c fatal.c groupaccess.c hostfile.c kex.c] [kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c log.c] [mac.c match.c md-sha256.c misc.c monitor.c monitor_fdpass.c] [monitor_mm.c monitor_wrap.c msg.c nchan.c packet.c progressmeter.c] [readconf.c readpass.c rsa.c scard.c scp.c servconf.c serverloop.c] [session.c sftp-client.c sftp-common.c sftp-glob.c sftp-server.c] [sftp.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c] [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c] [sshconnect2.c sshd.c sshlogin.c sshpty.c sshtty.c ttymodes.c] [uidswap.c uuencode.c xmalloc.c] Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that Theo nuked - our scripts to sync -portable need them in the files
* - deraadt@cvs.openbsd.org 2006/03/19 18:51:18Damien Miller2006-03-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | [atomicio.c auth-bsdauth.c auth-chall.c auth-krb5.c auth-options.c] [auth-pam.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c] [auth-shadow.c auth-skey.c auth.c auth1.c auth2-chall.c] [auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c] [auth2-pubkey.c auth2.c authfd.c authfile.c bufaux.c buffer.c] [canohost.c channels.c cipher-3des1.c cipher-acss.c cipher-aes.c] [cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c] [compress.c deattack.c dh.c dispatch.c dns.c entropy.c fatal.c] [groupaccess.c hostfile.c includes.h kex.c kexdh.c kexdhc.c] [kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c log.c loginrec.c] [loginrec.h logintest.c mac.c match.c md-sha256.c md5crypt.c misc.c] [monitor.c monitor_fdpass.c monitor_mm.c monitor_wrap.c msg.c] [nchan.c packet.c progressmeter.c readconf.c readpass.c rsa.c] [scard.c scp.c servconf.c serverloop.c session.c sftp-client.c] [sftp-common.c sftp-glob.c sftp-server.c sftp.c ssh-add.c] [ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c] [ssh-rand-helper.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c] [sshconnect2.c sshd.c sshlogin.c sshpty.c sshtty.c ttymodes.c] [uidswap.c uuencode.c xmalloc.c openbsd-compat/bsd-arc4random.c] [openbsd-compat/bsd-closefrom.c openbsd-compat/bsd-cygwin_util.c] [openbsd-compat/bsd-getpeereid.c openbsd-compat/bsd-misc.c] [openbsd-compat/bsd-nextstep.c openbsd-compat/bsd-snprintf.c] [openbsd-compat/bsd-waitpid.c openbsd-compat/fake-rfc2553.c] RCSID() can die
* - (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.acDarren Tucker2005-12-191-2/+2
| | | | | openbsd-compat/openssl-compat.h] Check for and work around broken AES ciphers >128bit on (some) Solaris 10 systems. ok djm@
* - djm@cvs.openbsd.org 2005/07/16 01:35:24Damien Miller2005-07-171-2/+2
| | | | | | [auth1.c channels.c cipher.c clientloop.c kex.c session.c ssh.c] [sshconnect.c] spacing
* - (dtucker) [cipher.c openbsd-compat/openbsd-compat.hDarren Tucker2005-06-171-0/+3
| | | | | | | | | openbsd-compat/openssl-compat.c] only include openssl compat stuff where it's needed as it can cause conflicts elsewhere (eg xcrypt.c). Found by and ok tim@ ---------------------------------------------------------------------- automatically CVS: CVS: Committing in . CVS: CVS: Modified Files: ----------------------------------------------------------------------
* - djm@cvs.openbsd.org 2005/06/17 02:44:33Damien Miller2005-06-171-4/+4
| | | | | | | | | | | [auth-rsa.c auth.c auth1.c auth2-chall.c auth2-gss.c authfd.c authfile.c] [bufaux.c canohost.c channels.c cipher.c clientloop.c dns.c gss-serv.c] [kex.c kex.h key.c mac.c match.c misc.c packet.c packet.h scp.c] [servconf.c session.c session.h sftp-client.c sftp-server.c sftp.c] [ssh-keyscan.c ssh-rsa.c sshconnect.c sshconnect1.c sshconnect2.c sshd.c] make this -Wsign-compare clean; ok avsm@ markus@ NB. auth1.c changes not committed yet (conflicts with uncommitted sync) NB2. more work may be needed to make portable Wsign-compare clean
* - dtucker@cvs.openbsd.org 2005/06/09 13:43:49Damien Miller2005-06-161-1/+1
| | | | | | [cipher.c] Correctly initialize end of array sentinel; ok djm@ (Id sync only, change already in portable)
* - (dtucker) [cipher.c openbsd-compat/Makefile.inDarren Tucker2005-06-091-40/+2
| | | | | | openbsd-compat/openbsd-compat.{c,h} openbsd-compat/openssl-compat.h] Move compatibility code for supporting older OpenSSL versions to the compat layer. Suggested by and "no objection" djm@
* - djm@cvs.openbsd.org 2005/05/23 23:32:46Damien Miller2005-05-261-23/+38
| | | | | | [cipher.c myproposal.h ssh.1 ssh_config.5 sshd_config.5] add support for draft-harris-ssh-arcfour-fixes-02 improved arcfour modes; ok markus@
* - djm@cvs.openbsd.org 2005/01/23 10:18:12Darren Tucker2005-01-241-4/+6
| | | | | [cipher.c] config option "Ciphers" should be case-sensitive; ok dtucker@
* - djm@cvs.openbsd.org 2004/12/22 02:13:19Darren Tucker2005-01-201-1/+1
| | | | | | | [cipher-ctr.c cipher.c] remove fallback AES support for old OpenSSL, as OpenBSD has had it for many years now; ok deraadt@ (Id sync only: Portable will continue to support older OpenSSLs)
* - markus@cvs.openbsd.org 2004/07/28 09:40:29Darren Tucker2004-08-121-2/+2
| | | | | | [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c sshconnect1.c] more s/illegal/invalid/
* - deraadt@cvs.openbsd.org 2004/07/11 17:48:47Darren Tucker2004-07-171-16/+16
| | | | | | | | [channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h sshd.c ttymodes.h] spaces
* - (dtucker) [cipher.c] encrypt->do_encrypt inside SSH_OLD_EVP to matchDarren Tucker2004-06-231-1/+1
| | | | -Wshadow change.
* - avsm@cvs.openbsd.org 2004/06/21 17:36:31Darren Tucker2004-06-221-9/+9
| | | | | | | | | | | | | [auth-rsa.c auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c cipher.c dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c monitor_wrap.h nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c ssh-gss.h ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c sshpty.c] make ssh -Wshadow clean, no functional changes markus@ ok There are also some portable-specific -Wshadow warnings to be fixed in monitor.c and montior_wrap.c.
* - (dtucker) [cipher.c] enable AES counter modes with OpenSSL 0.9.5.Darren Tucker2004-02-071-1/+1
| | | | ok djm@, markus@
* - (dtucker) [cipher-acss.c cipher.c] Enable acss only if building withDarren Tucker2004-02-061-1/+1
| | | | OpenSSL >= 0.9.7. ok djm@
* - hshoexer@cvs.openbsd.org 2004/01/23 19:26:33Damien Miller2004-01-271-2/+2
| | | | | | [cipher.c] rename acss@opebsd.org to acss@openssh.org ok deraadt@
* - (djm) OpenBSD CVS SyncDamien Miller2004-01-271-4/+17
| | | | | | | | | - hshoexer@cvs.openbsd.org 2004/01/23 17:06:03 [cipher.c] enable acss for ssh ok deraadt@ markus@ - (djm) [acss.c acss.h cipher-acss.c] Portable support for ACSS if libcrypto lacks it
* - jakob@cvs.openbsd.org 2003/11/10 16:23:41Damien Miller2003-11-171-6/+6
| | | | | | | [bufaux.c bufaux.h cipher.c cipher.h hostfile.c hostfile.h key.c] [key.h sftp-common.c sftp-common.h sftp-server.c sshconnect.c sshd.c] [ssh-dss.c ssh-rsa.c uuencode.c uuencode.h] constify. ok markus@ & djm@
* - (djm) Sync with V_3_7 branch:Damien Miller2003-09-231-0/+2
| | | | | | | | | | | - (djm) Fix SSH1 challenge kludge - (djm) Bug #671: Fix builds on OpenBSD - (djm) Bug #676: Fix PAM stack corruption - (djm) Fix bad free() in PAM code - (djm) Don't call pam_end before pam_init - (djm) Enable build with old OpenSSL again - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
* - markus@cvs.openbsd.org 2003/05/17 04:27:52Damien Miller2003-05-181-1/+12
| | | | | | | [cipher.c cipher-ctr.c myproposal.h] experimental support for aes-ctr modes from http://www.ietf.org/internet-drafts/draft-ietf-secsh-newmodes-00.txt ok djm@
* - markus@cvs.openbsd.org 2003/05/15 03:08:29Damien Miller2003-05-151-332/+6
| | | | | [cipher.c cipher-bf1.c cipher-aes.c cipher-3des1.c] split out custom EVP ciphers
* - markus@cvs.openbsd.org 2003/04/12 10:13:57Damien Miller2003-05-141-53/+50
| | | | | [cipher.c] hide cipher details; ok djm@
* - markus@cvs.openbsd.org 2002/11/21 22:45:31Ben Lindstrom2002-12-231-2/+2
| | | | | [cipher.c kex.c packet.c sshconnect.c sshconnect2.c] debug->debug2, unify debug messages
* - (djm) Bug #138: Make protocol 1 blowfish work with old OpenSSL.Damien Miller2002-09-101-0/+15
| | | | Patch from Robert Halubek <rob@adso.com.pl>
* - markus@cvs.openbsd.org 2002/07/12 15:50:17Ben Lindstrom2002-07-151-2/+2
| | | | | [cipher.c] EVP_CIPH_CUSTOM_IV for our own rijndael
* - deraadt@cvs.openbsd.org 2002/06/23 03:26:19Ben Lindstrom2002-06-231-1/+13
| | | | | [cipher.c key.c] KNF
* - markus@cvs.openbsd.org 2002/06/19 18:01:00Ben Lindstrom2002-06-211-30/+7
| | | | | | | [cipher.c monitor.c monitor_wrap.c packet.c packet.h] make the monitor sync the transfer ssh1 session key; transfer keycontext only for RC4 (this is still depends on EVP implementation details and is broken).
* - markus@cvs.openbsd.org 2002/06/04 23:05:49Ben Lindstrom2002-06-061-13/+13
| | | | | | | [cipher.c monitor.c monitor_fdpass.c monitor_mm.c monitor_wrap.c] __FUNCTION__ -> __func__ NOTE: This includes all portable references also.
* - markus@cvs.openbsd.org 2002/05/30 08:07:31Ben Lindstrom2002-06-061-5/+23
| | | | | | | [cipher.c] use rijndael/aes from libcrypto (openssl >= 0.9.7) instead of our own implementation. allow use of AES hardware via libcrypto, ok deraadt@
* - markus@cvs.openbsd.org 2002/05/16 22:02:50Ben Lindstrom2002-06-061-8/+8
| | | | | [cipher.c kex.h mac.c] fix warnings (openssl 0.9.7 requires const)
* - markus@cvs.openbsd.org 2002/04/03 09:26:11Ben Lindstrom2002-04-041-3/+5
| | | | | [cipher.c myproposal.h] re-add rijndael-cbc@lysator.liu.se for MacSSH; ash@lab.poc.net
* [cipher.c] fix problem with OpenBSD syncTim Rice2002-03-221-38/+38
|
* - markus@cvs.openbsd.org 2002/03/19 10:49:35Ben Lindstrom2002-03-221-6/+6
| | | | | | | [auth-krb5.c auth-rh-rsa.c auth.c cipher.c key.c misc.h packet.c session.c sftp-client.c sftp-glob.h sftp.c ssh-add.c ssh.c sshconnect2.c sshd.c ttymodes.c] KNF whitespace
* - markus@cvs.openbsd.org 2002/03/18 17:13:15Ben Lindstrom2002-03-221-1/+174
| | | | | [cipher.c cipher.h] export/import cipher states; needed by ssh-privsep
* Stupid djm commits experimental code to head instead of branchDamien Miller2002-03-131-40/+0
| | | | revert
* Import of Niels Provos' 20020312 ssh-complete.diffDamien Miller2002-03-131-0/+40
| | | | PAM, Cygwin and OSF SIA will not work for sure
* - (djm) Add Markus' patch for compat wih OpenSSL < 0.9.6.Damien Miller2002-03-111-0/+43
| | | | Known issue: Blowfish for SSH1 does not work
* - (djm) Revert bits of Markus' OpenSSL compat patch which was accidentallyDamien Miller2002-03-111-33/+0
| | | | committed.
* - (bal) Test for IRIX JOBS support at runtime. Patch providedBen Lindstrom2002-03-081-0/+33
| | | | by David Kaelbling <drk@sgi.com>
* - markus@cvs.openbsd.org 2002/02/18 13:05:32Damien Miller2002-02-191-370/+313
| | | | | [cipher.c cipher.h] switch to EVP, ok djm@ deraadt@
* - markus@cvs.openbsd.org 2002/02/14 23:41:01Damien Miller2002-02-191-11/+36
| | | | | | [authfile.c cipher.c cipher.h kex.c kex.h packet.c] hide some more implementation details of cipher.[ch] and prepares for move to EVP, ok deraadt@
* - markus@cvs.openbsd.org 2002/01/21 22:30:12Damien Miller2002-01-221-17/+1
| | | | | | [cipher.c compat.c myproposal.h] remove "rijndael-*", just use "aes-" since this how rijndael is called in the drafts; ok stevesk@
* - stevesk@cvs.openbsd.org 2002/01/18 18:14:17Damien Miller2002-01-221-2/+2
| | | | | [authfd.c bufaux.c buffer.c cipher.c packet.c ssh-agent.c ssh-keygen.c] unneeded cast cleanup; ok markus@
* - deraadt@cvs.openbsd.org 2001/12/19 07:18:56Damien Miller2001-12-211-6/+6
| | | | | | | | | | | | [auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h] [auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c] [cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c] [match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c] [servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c] [sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c] [sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config] [ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c] basic KNF done while i was looking for something else
* I was promised that this does not need to have endness fix up by Markus.Ben Lindstrom2001-09-141-30/+29
| | | | | | | | | So I will blindly trust him. =) - markus@cvs.openbsd.org 2001/08/23 11:31:59 [cipher.c cipher.h] switch to the optimised AES reference code from http://www.esat.kuleuven.ac.be/~rijmen/rijndael/rijndael-fst-3.0.zip