spelling; ok djm@

Garbage collect cipher_get_keyiv_len()

This is a compat20 leftover, unused since 2017.

ok djm

highly polished whitespace, mostly fixing spaces-for-tab and bad
indentation on continuation lines. Prompted by GHPR#185

Remove the pre-standardization cipher rijndael-cbc@lysator.liu.se.
It is an alias for aes256-cbc which was standardized in RFC4253 (2006),
has been deprecated and disabled by default since OpenSSH 7.2 (2016)
and was only briefly documented in ssh.1 in 2001.

This will reduce the amount of work the cipher/kex regression tests need
to do by a little bit. ok markus@ djm@

make Chacha20-POLY1305 context struct opaque; ok tb@ as part of a larger
diff at a2k20

spelling errors in comments; no code change
from https://fossies.org/linux/misc/openssh-8.2p1.tar.gz/codespell.html

change explicit_bzero();free() to freezero()

While freezero() returns early if the pointer is NULL the tests for
NULL in callers are left to avoid warnings about passing an
uninitialised size argument across a function boundry.

ok deraadt@ djm@

Make zlib optional. This adds a "ZLIB" build time option that allows
building without zlib compression and associated options. With feedback
from markus@, ok djm@

fixes for !WITH_OPENSSL compilation; ok dtucker@

hold our collective noses and use the openssl-1.1.x API in OpenSSH;
feedback and ok tb@ jsing@ markus@

Add experimental support for PQC XMSS keys (Extended Hash-Based Signatures)
The code is not compiled in by default (see WITH_XMSS in Makefile.inc)
Joint work with stefan-lukas_gazdag at genua.eu
See https://tools.ietf.org/html/draft-irtf-cfrg-xmss-hash-based-signatures-12
ok djm@

remove space before tab

Remove all guards for calls to OpenSSL free functions - all of these
functions handle NULL, from at least OpenSSL 1.0.1g onwards.

Prompted by dtucker@ asking about guards for RSA_free(), when looking at
openssh-portable pr#84 on github.

ok deraadt@ dtucker@

avoid unused variable warnings for !WITH_OPENSSL;
patch from Marcus Folkesson

As promised in last release announcement: remove support for
Blowfish, RC4 and CAST ciphers. ok markus@ deraadt@

another tentacle: cipher_set_key_string() was only ever used for SSHv1

fixup setting ciphercontext->plaintext (lost in SSHv1 purge), though
it isn't really used for much anymore.

remove SSHv1 ciphers; ok markus@

unifdef WITH_SSH1
ok markus@

small refactor of cipher.c: make ciphercontext opaque to callers
feedback and ok markus@

Remove NULL-checks before free().

ok dtucker@

make non-OpenSSL aes-ctr work on sshd w/ privsep; ok markus@

New key API: refactor key-related functions to be more library-like,
existing API is offered as a set of wrappers.

with and ok markus@

Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
Dempsky and Ron Bowes for a detailed review a few months ago.

make compiling against OpenSSL optional (make OPENSSL=no);
reduces algorithms to curve25519, aes-ctr, chacha, ed25519;
allows us to explore further options; with and ok djm

remove some logging that makes ssh debugging output very verbose;
ok markus

convert memset of potentially-private data to explicit_bzero()

replace openssl MD5 with our ssh_digest_*; ok djm@

Add a special case for the DH group size for 3des-cbc, which has an
effective strength much lower than the key size. This causes problems
with some cryptlib implementations, which don't support group sizes larger
than 4k but also don't use the largest group size it does support as
specified in the RFC. Based on a patch from Petr Lautrbach at Redhat,
reduced by me with input from Markus. ok djm@ markus@

new private key format, bcrypt as KDF by default; details in PROTOCOL.key;
feedback and lots help from djm; ok djm@

correct bzero of chacha20+poly1305 key context. bz#2177 from
Loganaden Velvindron @ AfriNIC

Also make it a memset for consistency with the rest of cipher.c

Add a new protocol 2 transport cipher "chacha20-poly1305@openssh.com"
that combines Daniel Bernstein's ChaCha20 stream cipher and Poly1305 MAC
to build an authenticated encryption mode.

Inspired by and similar to Adam Langley's proposal for TLS:
http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-03
but differs in layout used for the MAC calculation and the use of a
second ChaCha20 instance to separately encrypt packet lengths.
Details are in the PROTOCOL.chacha20poly1305 file.

Feedback markus@, naddy@; manpage bits Loganden Velvindron @ AfriNIC
ok markus@ naddy@

Output the effective values of Ciphers, MACs and KexAlgorithms when
the default has not been overridden. ok markus@

bye, bye xfree(); ok markus@

add the ability to query supported ciphers, MACs, key type and KEX
algorithms to ssh. Includes some refactoring of KEX and key type handling
to be table-driven; ok markus@

remove ACSS, now that it is gone from libcrypto too

improve error message for integrity failure in AES-GCM modes; ok markus@

support AES-GCM as defined in RFC 5647 (but with simpler KEX handling)
ok and feedback djm@

use OpenSSL's EVP_aes_{128,192,256}_ctr() API and remove our hand-rolled
counter mode code; ok djm@

add encrypt-then-mac (EtM) modes to openssh by defining new mac algorithms
that change the packet format and compute the MAC over the encrypted
message (including the packet size) instead of the plaintext data;
these EtM modes are considered more secure and used by default.
feedback and ok djm@

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

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

move #include <string.h> out of includes.h

Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
Theo nuked - our scripts to sync -portable need them in the files

RCSID() can die

branches: 1.77.2; 1.77.4;
spacing

make this -Wsign-compare clean; ok avsm@ markus@

Correctly initialize end of array sentinel; ok djm@

add support for draft-harris-ssh-arcfour-fixes-02 improved arcfour modes;
ok markus@

branches: 1.73.2;
config option "Ciphers" should be case-sensitive; ok dtucker@

remove fallback AES support for old OpenSSL, as OpenBSD has had it for many
years now; ok deraadt@

branches: 1.71.2;
more s/illegal/invalid/

spaces

make ssh -Wshadow clean, no functional changes
markus@ ok

branches: 1.68.2;
rename acss@opebsd.org to acss@openssh.org
ok deraadt@

enable acss for ssh
ok deraadt@ markus@

constify. ok markus@ & djm@

branches: 1.65.2;
experimental support for aes-ctr modes from
http://www.ietf.org/internet-drafts/draft-ietf-secsh-newmodes-00.txt
ok djm@

split out custom EVP ciphers

hide cipher details; ok djm@

branches: 1.62.2;
debug->debug2, unify debug messages

branches: 1.61.2;
EVP_CIPH_CUSTOM_IV for our own rijndael

KNF

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).

__FUNCTION__ -> __func__

use rijndael/aes from libcrypto (openssl >= 0.9.7) instead of
our own implementation. allow use of AES hardware via libcrypto, ok deraadt@

fix warnings (openssl 0.9.7 requires const)

branches: 1.55.2;
re-add rijndael-cbc@lysator.liu.se for MacSSH; ash@lab.poc.net

KNF whitespace

export/import cipher states; needed by ssh-privsep

switch to EVP, ok djm@ deraadt@

hide some more implementation details of cipher.[ch] and prepares for move
to EVP, ok deraadt@

remove "rijndael-*", just use "aes-" since this how rijndael is called
in the drafts; ok stevesk@

unneeded cast cleanup; ok markus@

basic KNF done while i was looking for something else

branches: 1.47.2;
switch to the optimised AES reference code from
http://www.esat.kuleuven.ac.be/~rijmen/rijndael/rijndael-fst-3.0.zip

update copyright for 2001

more strict prototypes. raise warning level in Makefile.inc. markus ok'ed
TODO; cleanup headers

simpler 3des for ssh1

branches: 1.43.2;
unexpand and remove end-of-line whitespace; ok markus@

split ssh.h and try to cleanup the #include mess. remove unnecessary #includes.
rename util.[ch] -> misc.[ch]

replace 'unsigned bla' with 'u_bla' everywhere. also, replace 'char unsigned'
with u_char.

undo rijndael changes

new rijndael implementation. fixes endian bugs

des_cbc_encrypt -> des_ncbc_encrypt since it already updates the IV

branches: 1.37.2;
non-alignment dependent swap_bytes(); from simonb@wasabisystems.com/netbsd

debug3

rijndael/aes support

enable DES in SSH-1 clients only

remove DES

new cipher framework

a few more comments about it being ARC4 not RC4

cleanup copyright notices on all files. I have attempted to be accurate with
the details. everything is now under Tatu's licence (which I copied from his
readme), and/or the core-sdi bsd-ish thing for deattack, or various openbsd
developers under a 2-term bsd licence. We're not changing any rules, just
being accurate.

strtok() --> strsep(). (niels@ ok)

OpenBSD tag

check strtok() != NULL; ok niels@

branches: 1.26.2;
whitespace cleanup

#include <ssl/foo.h> -> <openssh/foo.h>

add Cipher and Protocol options to ssh/sshd, e.g.:
ssh -o 'Protocol 1,2' if you prefer proto 1, ssh -o 'Ciphers arcfour,3des-cbc'

comment typo

remove unused argument, split cipher_mask()

support ssh2 ciphers

remove unused cipher_attack_detected code

void* -> unsigned char*, ok niels@

KNF, final part 3

much more KNF

KNF part 1

syslog changes:
* Unified Logmessage for all auth-types, for success and for failed
* Standard connections get only ONE line in the LOG when level==LOG:
Auth-attempts are logged only, if authentication is:
a) successfull or
b) with passwd or
c) we had more than AUTH_FAIL_LOG failues
* many log() became verbose()
* old behaviour with level=VERBOSE

remove support for cipher RC4

replace assert() with error, fatal or packet_disconnect

use libssl md5 routines

better cipher name fix.

deal with NULL in ciphernames

less brain damage, get rid of 'no '

use libc md5

remove ``none''.

"ssh is a very large program" -- anonymous

cull, cull, cull

convert all uses of gmp to SSL bignum
convert all used of rsa to SSL rsa functions
remove all use of randomstate to OpenBSD arc4random() and arc4_stir()
all this done at a long long night in Canada.

blowfish is always there

all the idea code goes away

i bet a lot of people didn't know what ssh 1.2.16 had a nice license.
well, except for the patent issues. someone in sweden (forget their
name at the moment) cleaned out most of the patented code, and now
this code removes rsa code. when this is done, it will link against
libssl, but the work isn't completely done yet. then we need to bring
this up to modern days, featurewise.

Garbage collect cipher_get_keyiv_len()

This is a compat20 leftover, unused since 2017.

ok djm

highly polished whitespace, mostly fixing spaces-for-tab and bad
indentation on continuation lines. Prompted by GHPR#185

Remove the pre-standardization cipher rijndael-cbc@lysator.liu.se.
It is an alias for aes256-cbc which was standardized in RFC4253 (2006),
has been deprecated and disabled by default since OpenSSH 7.2 (2016)
and was only briefly documented in ssh.1 in 2001.

This will reduce the amount of work the cipher/kex regression tests need
to do by a little bit. ok markus@ djm@

make Chacha20-POLY1305 context struct opaque; ok tb@ as part of a larger
diff at a2k20

spelling errors in comments; no code change
from https://fossies.org/linux/misc/openssh-8.2p1.tar.gz/codespell.html

change explicit_bzero();free() to freezero()

While freezero() returns early if the pointer is NULL the tests for
NULL in callers are left to avoid warnings about passing an
uninitialised size argument across a function boundry.

ok deraadt@ djm@

Make zlib optional. This adds a "ZLIB" build time option that allows
building without zlib compression and associated options. With feedback
from markus@, ok djm@

fixes for !WITH_OPENSSL compilation; ok dtucker@

hold our collective noses and use the openssl-1.1.x API in OpenSSH;
feedback and ok tb@ jsing@ markus@

Add experimental support for PQC XMSS keys (Extended Hash-Based Signatures)
The code is not compiled in by default (see WITH_XMSS in Makefile.inc)
Joint work with stefan-lukas_gazdag at genua.eu
See https://tools.ietf.org/html/draft-irtf-cfrg-xmss-hash-based-signatures-12
ok djm@

remove space before tab

Remove all guards for calls to OpenSSL free functions - all of these
functions handle NULL, from at least OpenSSL 1.0.1g onwards.

Prompted by dtucker@ asking about guards for RSA_free(), when looking at
openssh-portable pr#84 on github.

ok deraadt@ dtucker@

avoid unused variable warnings for !WITH_OPENSSL;
patch from Marcus Folkesson

As promised in last release announcement: remove support for
Blowfish, RC4 and CAST ciphers. ok markus@ deraadt@

another tentacle: cipher_set_key_string() was only ever used for SSHv1

fixup setting ciphercontext->plaintext (lost in SSHv1 purge), though
it isn't really used for much anymore.

remove SSHv1 ciphers; ok markus@

unifdef WITH_SSH1
ok markus@

small refactor of cipher.c: make ciphercontext opaque to callers
feedback and ok markus@

Remove NULL-checks before free().

ok dtucker@

make non-OpenSSL aes-ctr work on sshd w/ privsep; ok markus@

New key API: refactor key-related functions to be more library-like,
existing API is offered as a set of wrappers.

with and ok markus@

Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
Dempsky and Ron Bowes for a detailed review a few months ago.

make compiling against OpenSSL optional (make OPENSSL=no);
reduces algorithms to curve25519, aes-ctr, chacha, ed25519;
allows us to explore further options; with and ok djm

remove some logging that makes ssh debugging output very verbose;
ok markus

convert memset of potentially-private data to explicit_bzero()

replace openssl MD5 with our ssh_digest_*; ok djm@

Add a special case for the DH group size for 3des-cbc, which has an
effective strength much lower than the key size. This causes problems
with some cryptlib implementations, which don't support group sizes larger
than 4k but also don't use the largest group size it does support as
specified in the RFC. Based on a patch from Petr Lautrbach at Redhat,
reduced by me with input from Markus. ok djm@ markus@

new private key format, bcrypt as KDF by default; details in PROTOCOL.key;
feedback and lots help from djm; ok djm@

correct bzero of chacha20+poly1305 key context. bz#2177 from
Loganaden Velvindron @ AfriNIC

Also make it a memset for consistency with the rest of cipher.c

Add a new protocol 2 transport cipher "chacha20-poly1305@openssh.com"
that combines Daniel Bernstein's ChaCha20 stream cipher and Poly1305 MAC
to build an authenticated encryption mode.

Inspired by and similar to Adam Langley's proposal for TLS:
http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-03
but differs in layout used for the MAC calculation and the use of a
second ChaCha20 instance to separately encrypt packet lengths.
Details are in the PROTOCOL.chacha20poly1305 file.

Feedback markus@, naddy@; manpage bits Loganden Velvindron @ AfriNIC
ok markus@ naddy@

Output the effective values of Ciphers, MACs and KexAlgorithms when
the default has not been overridden. ok markus@

bye, bye xfree(); ok markus@

add the ability to query supported ciphers, MACs, key type and KEX
algorithms to ssh. Includes some refactoring of KEX and key type handling
to be table-driven; ok markus@

remove ACSS, now that it is gone from libcrypto too

improve error message for integrity failure in AES-GCM modes; ok markus@

support AES-GCM as defined in RFC 5647 (but with simpler KEX handling)
ok and feedback djm@

use OpenSSL's EVP_aes_{128,192,256}_ctr() API and remove our hand-rolled
counter mode code; ok djm@

add encrypt-then-mac (EtM) modes to openssh by defining new mac algorithms
that change the packet format and compute the MAC over the encrypted
message (including the packet size) instead of the plaintext data;
these EtM modes are considered more secure and used by default.
feedback and ok djm@

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

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

move #include <string.h> out of includes.h

Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
Theo nuked - our scripts to sync -portable need them in the files

RCSID() can die

branches: 1.77.2; 1.77.4;
spacing

make this -Wsign-compare clean; ok avsm@ markus@

Correctly initialize end of array sentinel; ok djm@

add support for draft-harris-ssh-arcfour-fixes-02 improved arcfour modes;
ok markus@

branches: 1.73.2;
config option "Ciphers" should be case-sensitive; ok dtucker@

remove fallback AES support for old OpenSSL, as OpenBSD has had it for many
years now; ok deraadt@

branches: 1.71.2;
more s/illegal/invalid/

spaces

make ssh -Wshadow clean, no functional changes
markus@ ok

branches: 1.68.2;
rename acss@opebsd.org to acss@openssh.org
ok deraadt@

enable acss for ssh
ok deraadt@ markus@

constify. ok markus@ & djm@

branches: 1.65.2;
experimental support for aes-ctr modes from
http://www.ietf.org/internet-drafts/draft-ietf-secsh-newmodes-00.txt
ok djm@

split out custom EVP ciphers

hide cipher details; ok djm@

branches: 1.62.2;
debug->debug2, unify debug messages

branches: 1.61.2;
EVP_CIPH_CUSTOM_IV for our own rijndael

KNF

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).

__FUNCTION__ -> __func__

use rijndael/aes from libcrypto (openssl >= 0.9.7) instead of
our own implementation. allow use of AES hardware via libcrypto, ok deraadt@

fix warnings (openssl 0.9.7 requires const)

branches: 1.55.2;
re-add rijndael-cbc@lysator.liu.se for MacSSH; ash@lab.poc.net

KNF whitespace

export/import cipher states; needed by ssh-privsep

switch to EVP, ok djm@ deraadt@

hide some more implementation details of cipher.[ch] and prepares for move
to EVP, ok deraadt@

remove "rijndael-*", just use "aes-" since this how rijndael is called
in the drafts; ok stevesk@

unneeded cast cleanup; ok markus@

basic KNF done while i was looking for something else

branches: 1.47.2;
switch to the optimised AES reference code from
http://www.esat.kuleuven.ac.be/~rijmen/rijndael/rijndael-fst-3.0.zip

update copyright for 2001

more strict prototypes. raise warning level in Makefile.inc. markus ok'ed
TODO; cleanup headers

simpler 3des for ssh1

branches: 1.43.2;
unexpand and remove end-of-line whitespace; ok markus@

split ssh.h and try to cleanup the #include mess. remove unnecessary #includes.
rename util.[ch] -> misc.[ch]

replace 'unsigned bla' with 'u_bla' everywhere. also, replace 'char unsigned'
with u_char.

undo rijndael changes

new rijndael implementation. fixes endian bugs

des_cbc_encrypt -> des_ncbc_encrypt since it already updates the IV

branches: 1.37.2;
non-alignment dependent swap_bytes(); from simonb@wasabisystems.com/netbsd

debug3

rijndael/aes support

enable DES in SSH-1 clients only

remove DES

new cipher framework

a few more comments about it being ARC4 not RC4

cleanup copyright notices on all files. I have attempted to be accurate with
the details. everything is now under Tatu's licence (which I copied from his
readme), and/or the core-sdi bsd-ish thing for deattack, or various openbsd
developers under a 2-term bsd licence. We're not changing any rules, just
being accurate.

strtok() --> strsep(). (niels@ ok)

OpenBSD tag

check strtok() != NULL; ok niels@

branches: 1.26.2;
whitespace cleanup

#include <ssl/foo.h> -> <openssh/foo.h>

add Cipher and Protocol options to ssh/sshd, e.g.:
ssh -o 'Protocol 1,2' if you prefer proto 1, ssh -o 'Ciphers arcfour,3des-cbc'

comment typo

remove unused argument, split cipher_mask()

support ssh2 ciphers

remove unused cipher_attack_detected code

void* -> unsigned char*, ok niels@

KNF, final part 3

much more KNF

KNF part 1

syslog changes:
* Unified Logmessage for all auth-types, for success and for failed
* Standard connections get only ONE line in the LOG when level==LOG:
Auth-attempts are logged only, if authentication is:
a) successfull or
b) with passwd or
c) we had more than AUTH_FAIL_LOG failues
* many log() became verbose()
* old behaviour with level=VERBOSE

remove support for cipher RC4

replace assert() with error, fatal or packet_disconnect

use libssl md5 routines

better cipher name fix.

deal with NULL in ciphernames

less brain damage, get rid of 'no '

use libc md5

remove ``none''.

"ssh is a very large program" -- anonymous

cull, cull, cull

convert all uses of gmp to SSL bignum
convert all used of rsa to SSL rsa functions
remove all use of randomstate to OpenBSD arc4random() and arc4_stir()
all this done at a long long night in Canada.

blowfish is always there

all the idea code goes away

i bet a lot of people didn't know what ssh 1.2.16 had a nice license.
well, except for the patent issues. someone in sweden (forget their
name at the moment) cleaned out most of the patented code, and now
this code removes rsa code. when this is done, it will link against
libssl, but the work isn't completely done yet. then we need to bring
this up to modern days, featurewise.

highly polished whitespace, mostly fixing spaces-for-tab and bad
indentation on continuation lines. Prompted by GHPR#185

Remove the pre-standardization cipher rijndael-cbc@lysator.liu.se.
It is an alias for aes256-cbc which was standardized in RFC4253 (2006),
has been deprecated and disabled by default since OpenSSH 7.2 (2016)
and was only briefly documented in ssh.1 in 2001.

This will reduce the amount of work the cipher/kex regression tests need
to do by a little bit. ok markus@ djm@

make Chacha20-POLY1305 context struct opaque; ok tb@ as part of a larger
diff at a2k20

spelling errors in comments; no code change
from https://fossies.org/linux/misc/openssh-8.2p1.tar.gz/codespell.html

change explicit_bzero();free() to freezero()

While freezero() returns early if the pointer is NULL the tests for
NULL in callers are left to avoid warnings about passing an
uninitialised size argument across a function boundry.

ok deraadt@ djm@

Make zlib optional. This adds a "ZLIB" build time option that allows
building without zlib compression and associated options. With feedback
from markus@, ok djm@

fixes for !WITH_OPENSSL compilation; ok dtucker@

hold our collective noses and use the openssl-1.1.x API in OpenSSH;
feedback and ok tb@ jsing@ markus@

Add experimental support for PQC XMSS keys (Extended Hash-Based Signatures)
The code is not compiled in by default (see WITH_XMSS in Makefile.inc)
Joint work with stefan-lukas_gazdag at genua.eu
See https://tools.ietf.org/html/draft-irtf-cfrg-xmss-hash-based-signatures-12
ok djm@

remove space before tab

Remove all guards for calls to OpenSSL free functions - all of these
functions handle NULL, from at least OpenSSL 1.0.1g onwards.

Prompted by dtucker@ asking about guards for RSA_free(), when looking at
openssh-portable pr#84 on github.

ok deraadt@ dtucker@

avoid unused variable warnings for !WITH_OPENSSL;
patch from Marcus Folkesson

As promised in last release announcement: remove support for
Blowfish, RC4 and CAST ciphers. ok markus@ deraadt@

another tentacle: cipher_set_key_string() was only ever used for SSHv1

fixup setting ciphercontext->plaintext (lost in SSHv1 purge), though
it isn't really used for much anymore.

remove SSHv1 ciphers; ok markus@

unifdef WITH_SSH1
ok markus@

small refactor of cipher.c: make ciphercontext opaque to callers
feedback and ok markus@

Remove NULL-checks before free().

ok dtucker@

make non-OpenSSL aes-ctr work on sshd w/ privsep; ok markus@

New key API: refactor key-related functions to be more library-like,
existing API is offered as a set of wrappers.

with and ok markus@

Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
Dempsky and Ron Bowes for a detailed review a few months ago.

make compiling against OpenSSL optional (make OPENSSL=no);
reduces algorithms to curve25519, aes-ctr, chacha, ed25519;
allows us to explore further options; with and ok djm

remove some logging that makes ssh debugging output very verbose;
ok markus

convert memset of potentially-private data to explicit_bzero()

replace openssl MD5 with our ssh_digest_*; ok djm@

Add a special case for the DH group size for 3des-cbc, which has an
effective strength much lower than the key size. This causes problems
with some cryptlib implementations, which don't support group sizes larger
than 4k but also don't use the largest group size it does support as
specified in the RFC. Based on a patch from Petr Lautrbach at Redhat,
reduced by me with input from Markus. ok djm@ markus@

new private key format, bcrypt as KDF by default; details in PROTOCOL.key;
feedback and lots help from djm; ok djm@

correct bzero of chacha20+poly1305 key context. bz#2177 from
Loganaden Velvindron @ AfriNIC

Also make it a memset for consistency with the rest of cipher.c

Add a new protocol 2 transport cipher "chacha20-poly1305@openssh.com"
that combines Daniel Bernstein's ChaCha20 stream cipher and Poly1305 MAC
to build an authenticated encryption mode.

Inspired by and similar to Adam Langley's proposal for TLS:
http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-03
but differs in layout used for the MAC calculation and the use of a
second ChaCha20 instance to separately encrypt packet lengths.
Details are in the PROTOCOL.chacha20poly1305 file.

Feedback markus@, naddy@; manpage bits Loganden Velvindron @ AfriNIC
ok markus@ naddy@

Output the effective values of Ciphers, MACs and KexAlgorithms when
the default has not been overridden. ok markus@

bye, bye xfree(); ok markus@

add the ability to query supported ciphers, MACs, key type and KEX
algorithms to ssh. Includes some refactoring of KEX and key type handling
to be table-driven; ok markus@

remove ACSS, now that it is gone from libcrypto too

improve error message for integrity failure in AES-GCM modes; ok markus@

support AES-GCM as defined in RFC 5647 (but with simpler KEX handling)
ok and feedback djm@

use OpenSSL's EVP_aes_{128,192,256}_ctr() API and remove our hand-rolled
counter mode code; ok djm@

add encrypt-then-mac (EtM) modes to openssh by defining new mac algorithms
that change the packet format and compute the MAC over the encrypted
message (including the packet size) instead of the plaintext data;
these EtM modes are considered more secure and used by default.
feedback and ok djm@

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

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

move #include <string.h> out of includes.h

Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
Theo nuked - our scripts to sync -portable need them in the files

RCSID() can die

branches: 1.77.2; 1.77.4;
spacing

make this -Wsign-compare clean; ok avsm@ markus@

Correctly initialize end of array sentinel; ok djm@

add support for draft-harris-ssh-arcfour-fixes-02 improved arcfour modes;
ok markus@

branches: 1.73.2;
config option "Ciphers" should be case-sensitive; ok dtucker@

remove fallback AES support for old OpenSSL, as OpenBSD has had it for many
years now; ok deraadt@

branches: 1.71.2;
more s/illegal/invalid/

spaces

make ssh -Wshadow clean, no functional changes
markus@ ok

branches: 1.68.2;
rename acss@opebsd.org to acss@openssh.org
ok deraadt@

enable acss for ssh
ok deraadt@ markus@

constify. ok markus@ & djm@

branches: 1.65.2;
experimental support for aes-ctr modes from
http://www.ietf.org/internet-drafts/draft-ietf-secsh-newmodes-00.txt
ok djm@

split out custom EVP ciphers

hide cipher details; ok djm@

branches: 1.62.2;
debug->debug2, unify debug messages

branches: 1.61.2;
EVP_CIPH_CUSTOM_IV for our own rijndael

KNF

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).

__FUNCTION__ -> __func__

use rijndael/aes from libcrypto (openssl >= 0.9.7) instead of
our own implementation. allow use of AES hardware via libcrypto, ok deraadt@

fix warnings (openssl 0.9.7 requires const)

branches: 1.55.2;
re-add rijndael-cbc@lysator.liu.se for MacSSH; ash@lab.poc.net

KNF whitespace

export/import cipher states; needed by ssh-privsep

switch to EVP, ok djm@ deraadt@

hide some more implementation details of cipher.[ch] and prepares for move
to EVP, ok deraadt@

remove "rijndael-*", just use "aes-" since this how rijndael is called
in the drafts; ok stevesk@

unneeded cast cleanup; ok markus@

basic KNF done while i was looking for something else

branches: 1.47.2;
switch to the optimised AES reference code from
http://www.esat.kuleuven.ac.be/~rijmen/rijndael/rijndael-fst-3.0.zip

update copyright for 2001

more strict prototypes. raise warning level in Makefile.inc. markus ok'ed
TODO; cleanup headers

simpler 3des for ssh1

branches: 1.43.2;
unexpand and remove end-of-line whitespace; ok markus@

split ssh.h and try to cleanup the #include mess. remove unnecessary #includes.
rename util.[ch] -> misc.[ch]

replace 'unsigned bla' with 'u_bla' everywhere. also, replace 'char unsigned'
with u_char.

undo rijndael changes

new rijndael implementation. fixes endian bugs

des_cbc_encrypt -> des_ncbc_encrypt since it already updates the IV

branches: 1.37.2;
non-alignment dependent swap_bytes(); from simonb@wasabisystems.com/netbsd

debug3

rijndael/aes support

enable DES in SSH-1 clients only

remove DES

new cipher framework

a few more comments about it being ARC4 not RC4

cleanup copyright notices on all files. I have attempted to be accurate with
the details. everything is now under Tatu's licence (which I copied from his
readme), and/or the core-sdi bsd-ish thing for deattack, or various openbsd
developers under a 2-term bsd licence. We're not changing any rules, just
being accurate.

strtok() --> strsep(). (niels@ ok)

OpenBSD tag

check strtok() != NULL; ok niels@

branches: 1.26.2;
whitespace cleanup

#include <ssl/foo.h> -> <openssh/foo.h>

add Cipher and Protocol options to ssh/sshd, e.g.:
ssh -o 'Protocol 1,2' if you prefer proto 1, ssh -o 'Ciphers arcfour,3des-cbc'

comment typo

remove unused argument, split cipher_mask()

support ssh2 ciphers

remove unused cipher_attack_detected code

void* -> unsigned char*, ok niels@

KNF, final part 3

much more KNF

KNF part 1

syslog changes:
* Unified Logmessage for all auth-types, for success and for failed
* Standard connections get only ONE line in the LOG when level==LOG:
Auth-attempts are logged only, if authentication is:
a) successfull or
b) with passwd or
c) we had more than AUTH_FAIL_LOG failues
* many log() became verbose()
* old behaviour with level=VERBOSE

remove support for cipher RC4

replace assert() with error, fatal or packet_disconnect

use libssl md5 routines

better cipher name fix.

deal with NULL in ciphernames

less brain damage, get rid of 'no '

use libc md5

remove ``none''.

"ssh is a very large program" -- anonymous

cull, cull, cull

convert all uses of gmp to SSL bignum
convert all used of rsa to SSL rsa functions
remove all use of randomstate to OpenBSD arc4random() and arc4_stir()
all this done at a long long night in Canada.

blowfish is always there

all the idea code goes away

i bet a lot of people didn't know what ssh 1.2.16 had a nice license.
well, except for the patent issues. someone in sweden (forget their
name at the moment) cleaned out most of the patented code, and now
this code removes rsa code. when this is done, it will link against
libssl, but the work isn't completely done yet. then we need to bring
this up to modern days, featurewise.

Remove the pre-standardization cipher rijndael-cbc@lysator.liu.se.
It is an alias for aes256-cbc which was standardized in RFC4253 (2006),
has been deprecated and disabled by default since OpenSSH 7.2 (2016)
and was only briefly documented in ssh.1 in 2001.

This will reduce the amount of work the cipher/kex regression tests need
to do by a little bit. ok markus@ djm@

make Chacha20-POLY1305 context struct opaque; ok tb@ as part of a larger
diff at a2k20

spelling errors in comments; no code change
from https://fossies.org/linux/misc/openssh-8.2p1.tar.gz/codespell.html

change explicit_bzero();free() to freezero()

While freezero() returns early if the pointer is NULL the tests for
NULL in callers are left to avoid warnings about passing an
uninitialised size argument across a function boundry.

ok deraadt@ djm@

Make zlib optional. This adds a "ZLIB" build time option that allows
building without zlib compression and associated options. With feedback
from markus@, ok djm@

fixes for !WITH_OPENSSL compilation; ok dtucker@

hold our collective noses and use the openssl-1.1.x API in OpenSSH;
feedback and ok tb@ jsing@ markus@

Add experimental support for PQC XMSS keys (Extended Hash-Based Signatures)
The code is not compiled in by default (see WITH_XMSS in Makefile.inc)
Joint work with stefan-lukas_gazdag at genua.eu
See https://tools.ietf.org/html/draft-irtf-cfrg-xmss-hash-based-signatures-12
ok djm@

remove space before tab

Remove all guards for calls to OpenSSL free functions - all of these
functions handle NULL, from at least OpenSSL 1.0.1g onwards.

Prompted by dtucker@ asking about guards for RSA_free(), when looking at
openssh-portable pr#84 on github.

ok deraadt@ dtucker@

avoid unused variable warnings for !WITH_OPENSSL;
patch from Marcus Folkesson

As promised in last release announcement: remove support for
Blowfish, RC4 and CAST ciphers. ok markus@ deraadt@

another tentacle: cipher_set_key_string() was only ever used for SSHv1

fixup setting ciphercontext->plaintext (lost in SSHv1 purge), though
it isn't really used for much anymore.

remove SSHv1 ciphers; ok markus@

unifdef WITH_SSH1
ok markus@

small refactor of cipher.c: make ciphercontext opaque to callers
feedback and ok markus@

Remove NULL-checks before free().

ok dtucker@

make non-OpenSSL aes-ctr work on sshd w/ privsep; ok markus@

New key API: refactor key-related functions to be more library-like,
existing API is offered as a set of wrappers.

with and ok markus@

Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
Dempsky and Ron Bowes for a detailed review a few months ago.

make compiling against OpenSSL optional (make OPENSSL=no);
reduces algorithms to curve25519, aes-ctr, chacha, ed25519;
allows us to explore further options; with and ok djm

remove some logging that makes ssh debugging output very verbose;
ok markus

convert memset of potentially-private data to explicit_bzero()

replace openssl MD5 with our ssh_digest_*; ok djm@

Add a special case for the DH group size for 3des-cbc, which has an
effective strength much lower than the key size. This causes problems
with some cryptlib implementations, which don't support group sizes larger
than 4k but also don't use the largest group size it does support as
specified in the RFC. Based on a patch from Petr Lautrbach at Redhat,
reduced by me with input from Markus. ok djm@ markus@

new private key format, bcrypt as KDF by default; details in PROTOCOL.key;
feedback and lots help from djm; ok djm@

correct bzero of chacha20+poly1305 key context. bz#2177 from
Loganaden Velvindron @ AfriNIC

Also make it a memset for consistency with the rest of cipher.c

Add a new protocol 2 transport cipher "chacha20-poly1305@openssh.com"
that combines Daniel Bernstein's ChaCha20 stream cipher and Poly1305 MAC
to build an authenticated encryption mode.

Inspired by and similar to Adam Langley's proposal for TLS:
http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-03
but differs in layout used for the MAC calculation and the use of a
second ChaCha20 instance to separately encrypt packet lengths.
Details are in the PROTOCOL.chacha20poly1305 file.

Feedback markus@, naddy@; manpage bits Loganden Velvindron @ AfriNIC
ok markus@ naddy@

Output the effective values of Ciphers, MACs and KexAlgorithms when
the default has not been overridden. ok markus@

bye, bye xfree(); ok markus@

add the ability to query supported ciphers, MACs, key type and KEX
algorithms to ssh. Includes some refactoring of KEX and key type handling
to be table-driven; ok markus@

remove ACSS, now that it is gone from libcrypto too

improve error message for integrity failure in AES-GCM modes; ok markus@

support AES-GCM as defined in RFC 5647 (but with simpler KEX handling)
ok and feedback djm@

use OpenSSL's EVP_aes_{128,192,256}_ctr() API and remove our hand-rolled
counter mode code; ok djm@

add encrypt-then-mac (EtM) modes to openssh by defining new mac algorithms
that change the packet format and compute the MAC over the encrypted
message (including the packet size) instead of the plaintext data;
these EtM modes are considered more secure and used by default.
feedback and ok djm@

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

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

move #include <string.h> out of includes.h

Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
Theo nuked - our scripts to sync -portable need them in the files

RCSID() can die

branches: 1.77.2; 1.77.4;
spacing

make this -Wsign-compare clean; ok avsm@ markus@

Correctly initialize end of array sentinel; ok djm@

add support for draft-harris-ssh-arcfour-fixes-02 improved arcfour modes;
ok markus@

branches: 1.73.2;
config option "Ciphers" should be case-sensitive; ok dtucker@

remove fallback AES support for old OpenSSL, as OpenBSD has had it for many
years now; ok deraadt@

branches: 1.71.2;
more s/illegal/invalid/

spaces

make ssh -Wshadow clean, no functional changes
markus@ ok

branches: 1.68.2;
rename acss@opebsd.org to acss@openssh.org
ok deraadt@

enable acss for ssh
ok deraadt@ markus@

constify. ok markus@ & djm@

branches: 1.65.2;
experimental support for aes-ctr modes from
http://www.ietf.org/internet-drafts/draft-ietf-secsh-newmodes-00.txt
ok djm@

split out custom EVP ciphers

hide cipher details; ok djm@

branches: 1.62.2;
debug->debug2, unify debug messages

branches: 1.61.2;
EVP_CIPH_CUSTOM_IV for our own rijndael

KNF

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).

__FUNCTION__ -> __func__

use rijndael/aes from libcrypto (openssl >= 0.9.7) instead of
our own implementation. allow use of AES hardware via libcrypto, ok deraadt@

fix warnings (openssl 0.9.7 requires const)

branches: 1.55.2;
re-add rijndael-cbc@lysator.liu.se for MacSSH; ash@lab.poc.net

KNF whitespace

export/import cipher states; needed by ssh-privsep

switch to EVP, ok djm@ deraadt@

hide some more implementation details of cipher.[ch] and prepares for move
to EVP, ok deraadt@

remove "rijndael-*", just use "aes-" since this how rijndael is called
in the drafts; ok stevesk@

unneeded cast cleanup; ok markus@

basic KNF done while i was looking for something else

branches: 1.47.2;
switch to the optimised AES reference code from
http://www.esat.kuleuven.ac.be/~rijmen/rijndael/rijndael-fst-3.0.zip

update copyright for 2001

more strict prototypes. raise warning level in Makefile.inc. markus ok'ed
TODO; cleanup headers

simpler 3des for ssh1

branches: 1.43.2;
unexpand and remove end-of-line whitespace; ok markus@

split ssh.h and try to cleanup the #include mess. remove unnecessary #includes.
rename util.[ch] -> misc.[ch]

replace 'unsigned bla' with 'u_bla' everywhere. also, replace 'char unsigned'
with u_char.

undo rijndael changes

new rijndael implementation. fixes endian bugs

des_cbc_encrypt -> des_ncbc_encrypt since it already updates the IV

branches: 1.37.2;
non-alignment dependent swap_bytes(); from simonb@wasabisystems.com/netbsd

debug3

rijndael/aes support

enable DES in SSH-1 clients only

remove DES

new cipher framework

a few more comments about it being ARC4 not RC4

cleanup copyright notices on all files. I have attempted to be accurate with
the details. everything is now under Tatu's licence (which I copied from his
readme), and/or the core-sdi bsd-ish thing for deattack, or various openbsd
developers under a 2-term bsd licence. We're not changing any rules, just
being accurate.

strtok() --> strsep(). (niels@ ok)

OpenBSD tag

check strtok() != NULL; ok niels@

branches: 1.26.2;
whitespace cleanup

#include <ssl/foo.h> -> <openssh/foo.h>

add Cipher and Protocol options to ssh/sshd, e.g.:
ssh -o 'Protocol 1,2' if you prefer proto 1, ssh -o 'Ciphers arcfour,3des-cbc'

comment typo

remove unused argument, split cipher_mask()

support ssh2 ciphers

remove unused cipher_attack_detected code

void* -> unsigned char*, ok niels@

KNF, final part 3

much more KNF

KNF part 1

syslog changes:
* Unified Logmessage for all auth-types, for success and for failed
* Standard connections get only ONE line in the LOG when level==LOG:
Auth-attempts are logged only, if authentication is:
a) successfull or
b) with passwd or
c) we had more than AUTH_FAIL_LOG failues
* many log() became verbose()
* old behaviour with level=VERBOSE

remove support for cipher RC4

replace assert() with error, fatal or packet_disconnect