]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
openssh: cherry-pick OpenSSL 1.1.1 compatibility
authoremaste <emaste@FreeBSD.org>
Wed, 19 Sep 2018 21:18:44 +0000 (21:18 +0000)
committeremaste <emaste@FreeBSD.org>
Wed, 19 Sep 2018 21:18:44 +0000 (21:18 +0000)
commit1f5ea8493212adc60117e7ac64e3e254bb5cc417
tree82ccc05f20935ae9eabbc36cbaad208601c9eb85
parentd46475a2e7b9bc0520eb97b7d62ab118b70237e2
openssh: cherry-pick OpenSSL 1.1.1 compatibility

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.

Sponsored by: The FreeBSD Foundation
30 files changed:
crypto/openssh/auth-pam.c
crypto/openssh/auth2.c
crypto/openssh/cipher.c
crypto/openssh/cipher.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/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