View | Details | Raw Unified | Return to bug 2931 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.ac (+1 lines)
Lines 2710-2715 if test "x$openssl" = "xyes" ; then Link Here
2710
	])
2710
	])
2711
	# LibreSSL/OpenSSL 1.1x API
2711
	# LibreSSL/OpenSSL 1.1x API
2712
	AC_CHECK_FUNCS([ \
2712
	AC_CHECK_FUNCS([ \
2713
		OPENSSL_init_crypto \
2713
		DH_get0_key \
2714
		DH_get0_key \
2714
		DH_get0_pqg \
2715
		DH_get0_pqg \
2715
		DH_set0_key \
2716
		DH_set0_key \
(-)a/openbsd-compat/openssl-compat.c (-3 / +6 lines)
Lines 76-86 ssh_OpenSSL_add_all_algorithms(void) Link Here
76
	ENGINE_load_builtin_engines();
76
	ENGINE_load_builtin_engines();
77
	ENGINE_register_all_complete();
77
	ENGINE_register_all_complete();
78
78
79
#if OPENSSL_VERSION_NUMBER < 0x10100000L
79
#if defined(HAVE_OPENSSL_INIT_CRYPTO) && \
80
	OPENSSL_config(NULL);
80
     defined(OPENSSL_INIT_ADD_ALL_CIPHERS) && \
81
#else
81
     defined(OPENSSL_INIT_ADD_ALL_DIGESTS) && \
82
     defined(OPENSSL_INIT_LOAD_CONFIG)
82
	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
83
	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
83
	    OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL);
84
	    OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL);
85
#else
86
	OPENSSL_config(NULL);
84
#endif
87
#endif
85
}
88
}
86
#endif
89
#endif

Return to bug 2931