summaryrefslogtreecommitdiff
path: root/openbsd-compat
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-03-07 12:01:47 +1100
committerDarren Tucker <dtucker@zip.com.au>2009-03-07 12:01:47 +1100
commit8aae6ff0d9e3b78204288f1db671ccd60614e10b (patch)
tree7934908d17ecb3ed97f377428b010c9064353c21 /openbsd-compat
parent558d6ca949e36811259c05bac1416b6f317beef8 (diff)
- (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.
Diffstat (limited to 'openbsd-compat')
-rw-r--r--openbsd-compat/openssl-compat.c9
-rw-r--r--openbsd-compat/openssl-compat.h3
2 files changed, 10 insertions, 2 deletions
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