From 36b68fd5a88637245e129eed5308671d76aaec37 Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Sat, 7 Mar 2009 01:01:47 +0000
Subject: [PATCH]  - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}]
 Add    EVP_DigestUpdate to the OLD_EVP compatibility functions and tell
 schnorr.c    to use them.  Allows building with older OpenSSL versions.

---
 ChangeLog                       | 3 +++
 openbsd-compat/openssl-compat.c | 7 +++++++
 openbsd-compat/openssl-compat.h | 1 +
 schnorr.c                       | 2 ++
 4 files changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6964dcff..410c766a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
  - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it
    exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS
    has a /dev/random).
+ - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add
+   EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c
+   to use them.  Allows building with older OpenSSL versions.
 
 20090306
  - (djm) OpenBSD CVS Sync
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index 56449092..002aa0ad 100644
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -47,6 +47,13 @@ ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *evp)
 	EVP_CIPHER_CTX_cleanup(evp);
 	return 1;
 }
+
+int
+ssh_EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *d, unsigned int cnt)
+{
+	EVP_DigestUpdate(ctx, d, cnt);
+	return 1;
+}
 #endif
 
 #ifdef	USE_OPENSSL_ENGINE
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index f08362ff..ee37b037 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -78,6 +78,7 @@ extern const EVP_CIPHER *evp_acss(void);
 #  define EVP_CipherInit(a,b,c,d,e)	ssh_EVP_CipherInit((a),(b),(c),(d),(e))
 #  define EVP_Cipher(a,b,c,d)		ssh_EVP_Cipher((a),(b),(c),(d))
 #  define EVP_CIPHER_CTX_cleanup(a)	ssh_EVP_CIPHER_CTX_cleanup((a))
+#  define EVP_DigestUpdate(a,b,c)	ssh_EVP_DigestUpdate((a),(b),(c))
 # endif /* SSH_OLD_EVP */
 
 # ifdef USE_OPENSSL_ENGINE
diff --git a/schnorr.c b/schnorr.c
index 7b97b556..c17ff324 100644
--- a/schnorr.c
+++ b/schnorr.c
@@ -42,6 +42,8 @@
 
 #include "schnorr.h"
 
+#include "openbsd-compat/openssl-compat.h"
+
 /* #define SCHNORR_DEBUG */		/* Privacy-violating debugging */
 /* #define SCHNORR_MAIN */		/* Include main() selftest */
 
-- 
2.45.2