Differential D17444

openssh: cherry-pick OpenSSL 1.1.1 compatibility
ClosedPublic
Actions

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

Tags

None

Referenced Files

	Unknown Object (File)
	Mon, Jun 1, 2:25 AM

	Unknown Object (File)
	Tue, May 26, 9:27 PM

	Unknown Object (File)
	Tue, May 26, 9:17 PM

	Unknown Object (File)
	Tue, May 26, 2:18 PM

	Unknown Object (File)
	Tue, May 26, 2:10 PM

	Unknown Object (File)
	Wed, May 20, 7:13 PM

	Unknown Object (File)
	Mon, May 18, 9:14 PM

	Unknown Object (File)
	Mon, May 18, 9:09 PM

Subscribers

Details

Reviewers

Commits

rS339213: openssh: cherry-pick OpenSSL 1.1.1 compatibility

Summary

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

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

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

Closed by commit rS339213: openssh: cherry-pick OpenSSL 1.1.1 compatibility (authored by emaste). · Explain WhyOct 6 2018, 2:39 PM

This revision was automatically updated to reflect the committed changes.

Herald added a subscriber: imp. · View Herald TranscriptOct 6 2018, 2:39 PM

Revision Contents
Changeset List

Path

Size

head/

crypto/

openssh/

4 lines

4 lines

4 lines

54 lines

96 lines

112 lines

2 lines

62 lines

digest-openssl.c

26 lines

2 lines

17 lines

13 lines

2 lines

20 lines

23 lines

10 lines

openbsd-compat/

1 line

libressl-api-compat.c

636 lines

openssl-compat.h

136 lines

regress/

unittests/

sshkey/

11 lines

79 lines

14 lines

50 lines

28 lines

25 lines

61 lines

ssh-pkcs11-client.c

14 lines

56 lines

49 lines

6 lines

7 lines

644 lines

secure/

lib/

libssh/

4 lines

Diff 48831

head/crypto/openssh

Loading...

head/crypto/openssh/auth-pam.c

Loading...

head/crypto/openssh/auth2.c

Loading...

head/crypto/openssh/cipher.h

Loading...

head/crypto/openssh/cipher.c

Loading...

head/crypto/openssh/config.h

Loading...

head/crypto/openssh/configure.ac

Loading...

head/crypto/openssh/dh.h

Loading...

head/crypto/openssh/dh.c

Loading...

head/crypto/openssh/digest-openssl.c

Loading...

head/crypto/openssh/kexdh.c

Loading...

head/crypto/openssh/kexdhc.c

Loading...

head/crypto/openssh/kexdhs.c

Loading...

head/crypto/openssh/kexgex.c

Loading...

head/crypto/openssh/kexgexc.c

Loading...

head/crypto/openssh/kexgexs.c

Loading...

head/crypto/openssh/monitor.c

Loading...

head/crypto/openssh/openbsd-compat/Makefile.in

Loading...

head/crypto/openssh/openbsd-compat/libressl-api-compat.c

Loading...

head/crypto/openssh/openbsd-compat/openssl-compat.h

Loading...

head/crypto/openssh/regress/unittests/sshkey/common.h

Loading...

head/crypto/openssh/regress/unittests/sshkey/common.c

Loading...

head/crypto/openssh/regress/unittests/sshkey/test_file.c

Loading...

head/crypto/openssh/regress/unittests/sshkey/test_sshkey.c

Loading...

head/crypto/openssh/ssh-dss.c

Loading...

head/crypto/openssh/ssh-ecdsa.c

Loading...

head/crypto/openssh/ssh-keygen.c

Loading...

head/crypto/openssh/ssh-pkcs11-client.c

Loading...

head/crypto/openssh/ssh-pkcs11.c

Loading...

head/crypto/openssh/ssh-rsa.c

Loading...

head/crypto/openssh/sshd.c

Loading...

head/crypto/openssh/sshkey.h

Loading...

head/crypto/openssh/sshkey.c

Loading...

head/secure/lib/libssh/Makefile

Loading...