gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/23520475 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/164c992e (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/fbd785fb (commit)



commit 235204759e0bbbdc1f3abd0868fe3f69904c849e
Merge: fbd785f 164c992
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri May 22 06:35:21 2015 -0700

    Merge branch 'gwen_fix_stdcall' from PR 5.


commit 164c992eccb036210163d941541999770146b1cc
Author: Holger Brunn <hbrunn at therp.nl>
Date:   Thu May 7 22:52:57 2015 +0200

    [FIX] segfault when using HBCI with keyfile

diff --git a/gwen-4.13.1.patch b/gwen-4.13.1.patch
index b31e211..03ee295 100644
--- a/gwen-4.13.1.patch
+++ b/gwen-4.13.1.patch
@@ -63,3 +63,69 @@
  #include <unistd.h>
  
  
+--- a/src/crypt3/cryptkey_be.h	2014-10-12 15:12:22 +0200
++++ b/src/crypt3/cryptkey_be.h	2015-05-07 20:51:40 +0200
+@@ -18,22 +18,22 @@
+ 
+ 
+ 
+-typedef int (*GWEN_CRYPT_KEY_SIGN_FN)(GWEN_CRYPT_KEY *k,
++typedef GWENHYWFAR_CB int (*GWEN_CRYPT_KEY_SIGN_FN)(GWEN_CRYPT_KEY *k,
+                                       const uint8_t *pInData,
+                                       uint32_t inLen,
+                                       uint8_t *pSignatureData,
+                                       uint32_t *pSignatureLen);
+-typedef int (*GWEN_CRYPT_KEY_VERIFY_FN)(GWEN_CRYPT_KEY *k,
++typedef GWENHYWFAR_CB int (*GWEN_CRYPT_KEY_VERIFY_FN)(GWEN_CRYPT_KEY *k,
+                                         const uint8_t *pInData,
+                                         uint32_t inLen,
+                                         const uint8_t *pSignatureData,
+                                         uint32_t signatureLen);
+-typedef int (*GWEN_CRYPT_KEY_ENCIPHER_FN)(GWEN_CRYPT_KEY *k,
++typedef GWENHYWFAR_CB int (*GWEN_CRYPT_KEY_ENCIPHER_FN)(GWEN_CRYPT_KEY *k,
+     const uint8_t *pInData,
+     uint32_t inLen,
+     uint8_t *pOutData,
+     uint32_t *pOutLen);
+-typedef int (*GWEN_CRYPT_KEY_DECIPHER_FN)(GWEN_CRYPT_KEY *k,
++typedef GWENHYWFAR_CB int (*GWEN_CRYPT_KEY_DECIPHER_FN)(GWEN_CRYPT_KEY *k,
+     const uint8_t *pInData,
+     uint32_t inLen,
+     uint8_t *pOutData,
+--- a/src/crypt3/cryptkeysym.c	2014-10-12 15:12:22 +0200
++++ b/src/crypt3/cryptkeysym.c	2015-05-07 20:51:04 +0200
+@@ -29,7 +29,7 @@
+ 
+ 
+ 
+-int GWEN_Crypt_KeySym_Encipher(GWEN_CRYPT_KEY *k,
++GWENHYWFAR_CB int GWEN_Crypt_KeySym_Encipher(GWEN_CRYPT_KEY *k,
+                                const uint8_t *pInData,
+                                uint32_t inLen,
+                                uint8_t *pOutData,
+@@ -53,7 +53,7 @@
+ 
+ 
+ 
+-int GWEN_Crypt_KeySym_Decipher(GWEN_CRYPT_KEY *k,
++GWENHYWFAR_CB int GWEN_Crypt_KeySym_Decipher(GWEN_CRYPT_KEY *k,
+                                const uint8_t *pInData,
+                                uint32_t inLen,
+                                uint8_t *pOutData,
+--- a/src/crypt3/cryptkeysym_p.h	2014-10-12 15:12:22 +0200
++++ b/src/crypt3/cryptkeysym_p.h	2015-05-07 20:50:41 +0200
+@@ -29,12 +29,12 @@
+ 
+ static GWENHYWFAR_CB void GWEN_Crypt_KeySym_freeData(void *bp, void *p);
+ 
+-static int GWEN_Crypt_KeySym_Encipher(GWEN_CRYPT_KEY *k,
++static GWENHYWFAR_CB int GWEN_Crypt_KeySym_Encipher(GWEN_CRYPT_KEY *k,
+                                       const uint8_t *pInData,
+                                       uint32_t inLen,
+                                       uint8_t *pOutData,
+                                       uint32_t *pOutLen);
+-static int GWEN_Crypt_KeySym_Decipher(GWEN_CRYPT_KEY *k,
++static GWENHYWFAR_CB int GWEN_Crypt_KeySym_Decipher(GWEN_CRYPT_KEY *k,
+                                       const uint8_t *pInData,
+                                       uint32_t inLen,
+                                       uint8_t *pOutData,



Summary of changes:
 gwen-4.13.1.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)