Attachment #1451 for bug #1437

Lines 166-171 Link Here

(-)openssh-4.7p1/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"
169		170
170	#include "entropy.h"	171	#include "entropy.h"
171		172




 * 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,

Return to bug 1437

Lines 16-30 Link Here

(-)openssh-4.7p1/openbsd-compat/openssl-compat.c (-3 / +1 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
19	#include "includes.h"	20	#include "includes.h"
20		21
21	#ifdef USE_OPENSSL_ENGINE	22	#ifdef USE_OPENSSL_ENGINE
22	# include <openssl/engine.h>	23	# include <openssl/engine.h>
23	#endif	24	#endif
24		25
25	#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
26	#include "openssl-compat.h"
27
28	#ifdef SSH_OLD_EVP	26	#ifdef SSH_OLD_EVP
29	int	27	int
30	ssh_EVP_CipherInit(EVP_CIPHER_CTX evp, const EVP_CIPHER type,	28	ssh_EVP_CipherInit(EVP_CIPHER_CTX evp, const EVP_CIPHER type,