Attachment #1458 for bug #1437

Lines 166-172 Link Here

(-)includes.h (-1 lines)
166	#include "platform.h"	166	#include "platform.h"
167	#include "openbsd-compat/openbsd-compat.h"	167	#include "openbsd-compat/openbsd-compat.h"
168	#include "openbsd-compat/bsd-nextstep.h"	168	#include "openbsd-compat/bsd-nextstep.h"
169	#include "openbsd-compat/openssl-compat.h"
170		169
171	#include "entropy.h"	170	#include "entropy.h"
172		171

Lines 42-47 Link Here

(-)ssh-add.c (+1 lines)
42	#include <sys/param.h>	42	#include <sys/param.h>
43		43
44	#include <openssl/evp.h>	44	#include <openssl/evp.h>
		45	#include "openbsd-compat/openssl-compat.h"
45		46
46	#include <fcntl.h>	47	#include <fcntl.h>
47	#include <pwd.h>	48	#include <pwd.h>

Lines 51-56 Link Here

(-)ssh-agent.c (+1 lines)
51		51
52	#include <openssl/evp.h>	52	#include <openssl/evp.h>
53	#include <openssl/md5.h>	53	#include <openssl/md5.h>
		54	#include "openbsd-compat/openssl-compat.h"
54		55
55	#include <errno.h>	56	#include <errno.h>
56	#include <fcntl.h>	57	#include <fcntl.h>

Lines 21-26 Link Here

(-)ssh-keygen.c (+1 lines)
21		21
22	#include <openssl/evp.h>	22	#include <openssl/evp.h>
23	#include <openssl/pem.h>	23	#include <openssl/pem.h>
		24	#include "openbsd-compat/openssl-compat.h"
24		25
25	#include <errno.h>	26	#include <errno.h>
26	#include <fcntl.h>	27	#include <fcntl.h>

Lines 72-77 Link Here

(-)ssh.c (+1 lines)
72		72
73	#include <openssl/evp.h>	73	#include <openssl/evp.h>
74	#include <openssl/err.h>	74	#include <openssl/err.h>
		75	#include "openbsd-compat/openssl-compat.h"
75		76
76	#include "xmalloc.h"	77	#include "xmalloc.h"
77	#include "ssh.h"	78	#include "ssh.h"

Lines 75-80 Link Here

(-)sshd.c (+2 lines)
75	#include <openssl/bn.h>	75	#include <openssl/bn.h>
76	#include <openssl/md5.h>	76	#include <openssl/md5.h>
77	#include <openssl/rand.h>	77	#include <openssl/rand.h>
		78	#include "openbsd-compat/openssl-compat.h"
		79
78	#ifdef HAVE_SECUREWARE	80	#ifdef HAVE_SECUREWARE
79	#include <sys/security.h>	81	#include <sys/security.h>
80	#include <prot.h>	82	#include <prot.h>




 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
#include "includes.h"

#ifdef USE_OPENSSL_ENGINE
# include <openssl/engine.h>
#endif

#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
#include "openssl-compat.h"

#ifdef SSH_OLD_EVP
int
ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type,

Lines 79-86 extern const EVP_CIPHER *evp_acss(void); Link Here

(-)openbsd-compat/openssl-compat.h (-2 / +2 lines)
79	# ifdef SSLeay_add_all_algorithms	79	# ifdef SSLeay_add_all_algorithms
80	# undef SSLeay_add_all_algorithms	80	# undef SSLeay_add_all_algorithms
81	# endif	81	# endif
82	# define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms()	82	# define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms()
83	#endif	83	# endif
84		84
85	int ssh_EVP_CipherInit(EVP_CIPHER_CTX , const EVP_CIPHER , unsigned char *,	85	int ssh_EVP_CipherInit(EVP_CIPHER_CTX , const EVP_CIPHER , unsigned char *,
86	unsigned char *, int);	86	unsigned char *, int);

Return to bug 1437

Lines 16-28 Link Here

(-)openbsd-compat/openssl-compat.c (-1 / +3 lines)
16	* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.	16	* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17	*/	17	*/
18		18
19	#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
20	#include "includes.h"	19	#include "includes.h"
21		20
22	#ifdef USE_OPENSSL_ENGINE	21	#ifdef USE_OPENSSL_ENGINE
23	# include <openssl/engine.h>	22	# include <openssl/engine.h>
24	#endif	23	#endif
25		24
		25	#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
		26	#include "openssl-compat.h"
		27
26	#ifdef SSH_OLD_EVP	28	#ifdef SSH_OLD_EVP
27	int	29	int
28	ssh_EVP_CipherInit(EVP_CIPHER_CTX evp, const EVP_CIPHER type,	30	ssh_EVP_CipherInit(EVP_CIPHER_CTX evp, const EVP_CIPHER type,