- (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.

diff --git a/ChangeLog b/ChangeLog
index 6964dcffaac08086967a010b7bec7ebf211dd92d..410c766af91d5887e33f04e50c7a57b693671dcb 100644 (file)
--- 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 564490921ac67e70c426688988f147478072b34d..002aa0adecd5907ca62f08fb8436ddc49c5fb3d5 100644 (file)
--- 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 f08362ff992ad50d74979a4db8d9bba82a597387..ee37b0377d297340a760399698fa7e284152454b 100644 (file)
--- 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 7b97b55656742e2d9c9adc57dbdba2f7a914ad32..c17ff3241b7c35a942536111c58e07e0bea6cc53 100644 (file)
--- 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 */