]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
openssh: cherry-pick OpenSSL 1.1.1 compatibility
authoremaste <emaste@FreeBSD.org>
Sat, 6 Oct 2018 14:38:34 +0000 (14:38 +0000)
committeremaste <emaste@FreeBSD.org>
Sat, 6 Oct 2018 14:38:34 +0000 (14:38 +0000)
commit3af09b53adb0abfd80065edc3c8212efd2d9ff23
tree1f25fe87d5a64852c654279bc8338bf7f6f08fbf
parent9759061b7c7b5c02e03824d38ecd8c458af08a76
parent6a7a6139a1bbc95bc956c63dd54d33bf19794930
openssh: cherry-pick OpenSSL 1.1.1 compatibility

Compatibility with existing OpenSSL versions is maintained.

Upstream commits:
482d23bcac upstream: hold our collective noses and use the openssl-1.1.x
48f54b9d12 adapt -portable to OpenSSL 1.1x API
86e0a9f3d2 upstream: use only openssl-1.1.x API here too
a3fd8074e2 upstream: missed a bit of openssl-1.0.x API in this unittest
cce8cbe0ed Fix openssl-1.1 fallout for --without-openssl.

Trivial conflicts in sshkey.c and test_sshkey.c were resolved.

Connect libressl-api-compat.c to the build, and regenerate config.h

Reviewed by: des
Approved by: re (rgrimes)
MFC after: 2 seeks
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D17444
33 files changed:
crypto/openssh/auth-pam.c
crypto/openssh/auth2.c
crypto/openssh/cipher.c
crypto/openssh/cipher.h
crypto/openssh/config.h
crypto/openssh/configure.ac
crypto/openssh/dh.c
crypto/openssh/dh.h
crypto/openssh/digest-openssl.c
crypto/openssh/kexdh.c
crypto/openssh/kexdhc.c
crypto/openssh/kexdhs.c
crypto/openssh/kexgex.c
crypto/openssh/kexgexc.c
crypto/openssh/kexgexs.c
crypto/openssh/monitor.c
crypto/openssh/openbsd-compat/Makefile.in
crypto/openssh/openbsd-compat/libressl-api-compat.c
crypto/openssh/openbsd-compat/openssl-compat.h
crypto/openssh/regress/unittests/sshkey/common.c
crypto/openssh/regress/unittests/sshkey/common.h
crypto/openssh/regress/unittests/sshkey/test_file.c
crypto/openssh/regress/unittests/sshkey/test_sshkey.c
crypto/openssh/ssh-dss.c
crypto/openssh/ssh-ecdsa.c
crypto/openssh/ssh-keygen.c
crypto/openssh/ssh-pkcs11-client.c
crypto/openssh/ssh-pkcs11.c
crypto/openssh/ssh-rsa.c
crypto/openssh/sshd.c
crypto/openssh/sshkey.c
crypto/openssh/sshkey.h
secure/lib/libssh/Makefile