Attachment #2041 for bug #1882

View | Details | Raw Unified | Return to bug 1882
Collapse All | Expand All

Lines 134-142 RSA_get_default_method(void) Link Here

(-)openbsd-compat/openssl-compat.c (-2 / +2 lines)
134		134
135	#ifdef USE_OPENSSL_ENGINE	135	#ifdef USE_OPENSSL_ENGINE
136	void	136	void
137	ssh_SSLeay_add_all_algorithms(void)	137	ssh_OpenSSL_add_all_algorithms(void)
138	{	138	{
139	SSLeay_add_all_algorithms();	139	OpenSSL_add_all_algorithms();
140		140
141	/* Enable use of crypto hardware */	141	/* Enable use of crypto hardware */
142	ENGINE_load_builtin_engines();	142	ENGINE_load_builtin_engines();




#  endif

# ifdef USE_OPENSSL_ENGINE
#  ifdef OpenSSL_add_all_algorithms
#   undef OpenSSL_add_all_algorithms
#  endif
#  define OpenSSL_add_all_algorithms()  ssh_OpenSSL_add_all_algorithms()
# endif

# ifndef HAVE_BN_IS_PRIME_EX

    unsigned char *, int);
int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int);
int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *);
void ssh_OpenSSL_add_all_algorithms(void);
#endif	/* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */


Return to bug 1882

Lines 106-115 RSA_METHOD *RSA_get_default_method(void) Link Here

(-)openbsd-compat/openssl-compat.h (-4 / +4 lines)
106	# endif	106	# endif
107		107
108	# ifdef USE_OPENSSL_ENGINE	108	# ifdef USE_OPENSSL_ENGINE
109	# ifdef SSLeay_add_all_algorithms	109	# ifdef OpenSSL_add_all_algorithms
110	# undef SSLeay_add_all_algorithms	110	# undef OpenSSL_add_all_algorithms
111	# endif	111	# endif
112	# define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms()	112	# define OpenSSL_add_all_algorithms() ssh_OpenSSL_add_all_algorithms()
113	# endif	113	# endif
114		114
115	# ifndef HAVE_BN_IS_PRIME_EX	115	# ifndef HAVE_BN_IS_PRIME_EX
Lines 129-134 int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, Link Here
129	unsigned char *, int);	129	unsigned char *, int);
130	int ssh_EVP_Cipher(EVP_CIPHER_CTX , char , char *, int);	130	int ssh_EVP_Cipher(EVP_CIPHER_CTX , char , char *, int);
131	int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *);	131	int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *);
132	void ssh_SSLeay_add_all_algorithms(void);	132	void ssh_OpenSSL_add_all_algorithms(void);
133	#endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */	133	#endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */
134		134