diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2018-10-03 16:11:13 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2018-10-03 16:11:13 +0000 |
| commit | 0a5cc6b21cce53f048784a6aee0cc78fb5b57946 (patch) | |
| tree | 5c6643a2e426ed55911b26d93bbf75d816b37203 /openbsd-compat/Makefile.in | |
| parent | d46065df2d60bfbd08939733bd79b2a440d6fbc8 (diff) | |
| download | src-0a5cc6b21cce53f048784a6aee0cc78fb5b57946.tar.gz src-0a5cc6b21cce53f048784a6aee0cc78fb5b57946.zip | |
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.
Discussed with: des
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=339155
Diffstat (limited to 'openbsd-compat/Makefile.in')
| -rw-r--r-- | openbsd-compat/Makefile.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in index 2fd9b952bbeb..c1e14cbd0ed4 100644 --- a/openbsd-compat/Makefile.in +++ b/openbsd-compat/Makefile.in @@ -85,6 +85,7 @@ COMPAT= arc4random.o \ getrrsetbyname-ldns.o \ kludge-fd_set.o \ openssl-compat.o \ + libressl-api-compat.o \ xcrypt.o PORTS= port-aix.o \ |