From: Bodo Möller <bodo@openssl.org>
Date: Fri, 9 Aug 2002 08:16:11 +0000 (+0000)
Subject: avoid crash on Windows
X-Git-Tag: OpenSSL-engine-0_9_6g~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ecdf1549931df3cab4935d4b2d0ee9b3d84c68a4;p=oweals%2Fopenssl.git

avoid crash on Windows

Submitted by: Lynn Gazis <lgazis@rainbow.com>
---

diff --git a/CHANGES b/CHANGES
index d89398adf0..263ac1d67d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,9 @@
 
  Changes between 0.9.6f and 0.9.6g  [xx XXX xxxx]
 
-  *) 
+  *) [In 0.9.6g-engine release:]
+     Fix crypto/engine/vendor_defns/cswift.h for WIN32 (use '_stdcall').
+     [Lynn Gazis <lgazis@rainbow.com>]
 
  Changes between 0.9.6e and 0.9.6f  [8 Aug 2002]
 
diff --git a/crypto/engine/vendor_defns/cswift.h b/crypto/engine/vendor_defns/cswift.h
index 0af14a1a92..dd5b1e6778 100644
--- a/crypto/engine/vendor_defns/cswift.h
+++ b/crypto/engine/vendor_defns/cswift.h
@@ -196,6 +196,19 @@ typedef SW_U32 SW_CONTEXT_HANDLE; /* opaque context handle */
 
 /* Now the OpenSSL bits, these function types are the for the function
  * pointers that will bound into the Rainbow shared libraries. */
+/********** Peng's modification begins **********/
+#if defined(WIN32) /* For WIN32 platform */
+typedef SW_STATUS _stdcall t_swAcquireAccContext(SW_CONTEXT_HANDLE *hac);
+typedef SW_STATUS _stdcall t_swAttachKeyParam(SW_CONTEXT_HANDLE hac,
+				SW_PARAM *key_params);
+typedef SW_STATUS _stdcall t_swSimpleRequest(SW_CONTEXT_HANDLE hac,
+				SW_COMMAND_CODE cmd,
+				SW_LARGENUMBER pin[],
+				SW_U32 pin_count,
+				SW_LARGENUMBER pout[],
+				SW_U32 pout_count);
+typedef SW_STATUS _stdcall t_swReleaseAccContext(SW_CONTEXT_HANDLE hac);
+#else /* For other platforms */
 typedef SW_STATUS t_swAcquireAccContext(SW_CONTEXT_HANDLE *hac);
 typedef SW_STATUS t_swAttachKeyParam(SW_CONTEXT_HANDLE hac,
 				SW_PARAM *key_params);
@@ -206,6 +219,9 @@ typedef SW_STATUS t_swSimpleRequest(SW_CONTEXT_HANDLE hac,
 				SW_LARGENUMBER pout[],
 				SW_U32 pout_count);
 typedef SW_STATUS t_swReleaseAccContext(SW_CONTEXT_HANDLE hac);
+#endif
+/********** Peng's modification ends **********/
+
 
 #ifdef __cplusplus
 }