summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/openssl-compat.c9
-rw-r--r--openbsd-compat/openssl-compat.h3
-rw-r--r--schnorr.c2
4 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6964dcffa..410c766af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
2 - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it 2 - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it
3 exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS 3 exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS
4 has a /dev/random). 4 has a /dev/random).
5 - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add
6 EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c
7 to use them. Allows building with older OpenSSL versions.
5 8
620090306 920090306
7 - (djm) OpenBSD CVS Sync 10 - (djm) OpenBSD CVS Sync
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index 49238ba80..f5435784b 100644
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -1,4 +1,4 @@
1/* $Id: openssl-compat.c,v 1.6 2008/02/28 08:13:52 dtucker Exp $ */ 1/* $Id: openssl-compat.c,v 1.7 2009/03/07 01:01:47 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> 4 * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@@ -47,6 +47,13 @@ ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *evp)
47 EVP_CIPHER_CTX_cleanup(evp); 47 EVP_CIPHER_CTX_cleanup(evp);
48 return 1; 48 return 1;
49} 49}
50
51int
52ssh_EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *d, unsigned int cnt)
53{
54 EVP_DigestUpdate(ctx, d, cnt);
55 return 1;
56}
50#endif 57#endif
51 58
52#ifdef USE_OPENSSL_ENGINE 59#ifdef USE_OPENSSL_ENGINE
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 6a1bed5b2..945a7a300 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openssl-compat.h,v 1.12 2008/02/28 08:22:04 dtucker Exp $ */ 1/* $Id: openssl-compat.h,v 1.13 2009/03/07 01:01:47 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> 4 * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@@ -78,6 +78,7 @@ extern const EVP_CIPHER *evp_acss(void);
78# define EVP_CipherInit(a,b,c,d,e) ssh_EVP_CipherInit((a),(b),(c),(d),(e)) 78# define EVP_CipherInit(a,b,c,d,e) ssh_EVP_CipherInit((a),(b),(c),(d),(e))
79# define EVP_Cipher(a,b,c,d) ssh_EVP_Cipher((a),(b),(c),(d)) 79# define EVP_Cipher(a,b,c,d) ssh_EVP_Cipher((a),(b),(c),(d))
80# define EVP_CIPHER_CTX_cleanup(a) ssh_EVP_CIPHER_CTX_cleanup((a)) 80# define EVP_CIPHER_CTX_cleanup(a) ssh_EVP_CIPHER_CTX_cleanup((a))
81# define EVP_DigestUpdate(a,b,c) ssh_EVP_DigestUpdate((a),(b),(c))
81# endif /* SSH_OLD_EVP */ 82# endif /* SSH_OLD_EVP */
82 83
83# ifdef USE_OPENSSL_ENGINE 84# ifdef USE_OPENSSL_ENGINE
diff --git a/schnorr.c b/schnorr.c
index 7b97b5565..c17ff3241 100644
--- a/schnorr.c
+++ b/schnorr.c
@@ -42,6 +42,8 @@
42 42
43#include "schnorr.h" 43#include "schnorr.h"
44 44
45#include "openbsd-compat/openssl-compat.h"
46
45/* #define SCHNORR_DEBUG */ /* Privacy-violating debugging */ 47/* #define SCHNORR_DEBUG */ /* Privacy-violating debugging */
46/* #define SCHNORR_MAIN */ /* Include main() selftest */ 48/* #define SCHNORR_MAIN */ /* Include main() selftest */
47 49