Page MenuHomeFreeBSD

openssh: cherry-pick OpenSSL 1.1.1 compatibility

Authored by emaste on Oct 5 2018, 9:41 PM.


  • proposed head commit **

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

Diff Detail

rS FreeBSD src repository
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

emaste created this revision.Oct 5 2018, 9:41 PM
des accepted this revision.Oct 5 2018, 9:47 PM
This revision is now accepted and ready to land.Oct 5 2018, 9:47 PM
emaste added a subscriber: releng.Oct 5 2018, 9:47 PM
This revision was automatically updated to reflect the committed changes.