30 lines
1005 B
Diff
30 lines
1005 B
Diff
|
From 5d2e9ee66efb6bae9941987cc09a98867ae9ba6d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jakub Jelen <jjelen@redhat.com>
|
||
|
|
Date: Sat, 5 Nov 2016 16:54:02 +0100
|
||
|
|
Subject: [PATCH] libcrypto: Use a pointer for EVP_CIPHER_CTX
|
||
|
|
|
||
|
|
This has been made opaque and it needs to be a pointer.
|
||
|
|
|
||
|
|
This is for OpenSSL 1.1.0 support.
|
||
|
|
|
||
|
|
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
|
||
|
|
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
|
||
|
|
---
|
||
|
|
include/libssh/crypto.h | 2 +-
|
||
|
|
src/libcrypto.c | 23 ++++++++++++++---------
|
||
|
|
src/wrapper.c | 3 +++
|
||
|
|
3 files changed, 18 insertions(+), 10 deletions(-)
|
||
|
|
|
||
|
|
Index: libssh-0.7.5/src/libcrypto.c
|
||
|
|
===================================================================
|
||
|
|
--- libssh-0.7.5.orig/src/libcrypto.c 2017-09-15 11:28:54.851673060 +0200
|
||
|
|
+++ libssh-0.7.5/src/libcrypto.c 2017-09-15 11:28:56.863704697 +0200
|
||
|
|
@@ -43,6 +43,7 @@
|
||
|
|
#include <openssl/hmac.h>
|
||
|
|
#include <openssl/opensslv.h>
|
||
|
|
#include <openssl/rand.h>
|
||
|
|
+#include "libcrypto-compat.h"
|
||
|
|
|
||
|
|
#ifdef HAVE_OPENSSL_AES_H
|
||
|
|
#define HAS_AES
|