[xmlsec] fixing issues with openssl/gost (Dmitry)

[Aleksey Sanin <aleksey src gnome org>]

commit 9a508ac7a53fd4d515b882ef4017715a41b41739
Author: Aleksey Sanin <aleksey aleksey com>
Date:   Tue Jan 31 11:28:26 2012 -0800

    fixing issues with openssl/gost (Dmitry)

 include/xmlsec/openssl/crypto.h  |   28 ++++++++++------------------
 include/xmlsec/openssl/symbols.h |    3 +++
 src/openssl/evp.c                |    2 +-
 3 files changed, 14 insertions(+), 19 deletions(-)
---
diff --git a/include/xmlsec/openssl/crypto.h b/include/xmlsec/openssl/crypto.h
index 8d4687a..7ceace3 100644
--- a/include/xmlsec/openssl/crypto.h
+++ b/include/xmlsec/openssl/crypto.h
@@ -209,6 +209,16 @@ XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId    xmlSecOpenSSLKeyDataGost2001GetKlass   (
         xmlSecOpenSSLTransformGost2001GostR3411_94GetKlass()
 XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecOpenSSLTransformGost2001GostR3411_94GetKlass(void);
 
+
+/**
+ * xmlSecOpenSSLTransformGostR3411_94Id:
+ *
+ * The GOSTR3411_94 signature transform klass.
+ */
+#define xmlSecOpenSSLTransformGostR3411_94Id \
+	xmlSecOpenSSLTransformGostR3411_94GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecOpenSSLTransformGostR3411_94GetKlass(void);
+
 #endif /* XMLSEC_NO_GOST */
 
 /********************************************************************
@@ -550,24 +560,6 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecOpenSSLTransformSha512GetKlass(void
 #endif /* XMLSEC_NO_SHA512 */
 
 
-/********************************************************************
- *
- * GOSTR3411_94 transform
- *
- *******************************************************************/
-#ifndef XMLSEC_NO_GOST
-
-/**
- * xmlSecOpenSSLTransformGostR3411_94Id:
- *
- * The GOSTR3411_94 digest transform klass.
- */
-#define xmlSecOpenSSLTransformGostR3411_94Id \
-        xmlSecOpenSSLTransformGostR3411_94GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecOpenSSLTransformGostR3411_94GetKlass(void);
-#endif /* XMLSEC_NO_GOST */
-
-
 
 /**************************************************************
  *
diff --git a/include/xmlsec/openssl/symbols.h b/include/xmlsec/openssl/symbols.h
index f99dfb6..9fb9153 100644
--- a/include/xmlsec/openssl/symbols.h
+++ b/include/xmlsec/openssl/symbols.h
@@ -86,6 +86,9 @@ extern "C" {
 #define xmlSecTransformSha256Id                 xmlSecOpenSSLTransformSha256Id
 #define xmlSecTransformSha384Id                 xmlSecOpenSSLTransformSha384Id
 #define xmlSecTransformSha512Id                 xmlSecOpenSSLTransformSha512Id
+#define xmlSecTransformGost2001GostR3411_94Id   xmlSecOpenSSLTransformGost2001GostR3411_94Id
+#define xmlSecTransformGostR3411_94Id           xmlSecOpenSSLTransformGostR3411_94Id
+
 
 /********************************************************************
  *
diff --git a/src/openssl/evp.c b/src/openssl/evp.c
index ab98c6c..a23de38 100644
--- a/src/openssl/evp.c
+++ b/src/openssl/evp.c
@@ -1682,7 +1682,7 @@ static xmlSecSize
 xmlSecOpenSSLKeyDataGost2001GetSize(xmlSecKeyDataPtr data) {
     xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecOpenSSLKeyDataGost2001Id), 0);
 
-    return xmlSecOpenSSLKeyDataGetSize(data);
+    return 512;
 }
 
 static void