heimdal: update to lorikeet-heimdal rev 801

[sfrench/samba-autobuild/.git] / source4 / heimdal / lib / hcrypto / evp.h

diff --git a/source4/heimdal/lib/hcrypto/evp.h b/source4/heimdal/lib/hcrypto/evp.h
index 4910ca01b8df87736e53e3fa079e6b6617e6f3cd..c8f8f80f800f9b22d9d59cbacb6859a995b0f920 100644 (file)
--- a/source4/heimdal/lib/hcrypto/evp.h
+++ b/source4/heimdal/lib/hcrypto/evp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: evp.h 21687 2007-07-24 16:29:05Z lha $ */
+/* $Id: evp.h 23141 2008-04-29 05:47:04Z lha $ */
 
 #ifndef HEIM_EVP_H
 #define HEIM_EVP_H 1
@@ -155,11 +155,17 @@ struct hc_CIPHER_CTX {
     unsigned char final[EVP_MAX_BLOCK_LENGTH];
 };
 
-struct hc_EVP_MD_CTX {
-    const EVP_MD *md;
-    ENGINE *engine;
-    void *ptr;
-};
+#if !defined(__GNUC__) && !defined(__attribute__)
+#define __attribute__(x)
+#endif
+
+#ifndef HC_DEPRECATED
+#define HC_DEPRECATED __attribute__((deprecated))
+#endif
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 /*
  * Avaible crypto algs
@@ -201,9 +207,9 @@ size_t      EVP_MD_CTX_block_size(EVP_MD_CTX *);
 
 EVP_MD_CTX *
        EVP_MD_CTX_create(void);
-void   EVP_MD_CTX_init(EVP_MD_CTX *);
+void   HC_DEPRECATED EVP_MD_CTX_init(EVP_MD_CTX *);
 void   EVP_MD_CTX_destroy(EVP_MD_CTX *);
-int    EVP_MD_CTX_cleanup(EVP_MD_CTX *);
+int    HC_DEPRECATED EVP_MD_CTX_cleanup(EVP_MD_CTX *);
 
 int    EVP_DigestInit_ex(EVP_MD_CTX *, const EVP_MD *, ENGINE *);
 int    EVP_DigestUpdate(EVP_MD_CTX *,const void *, size_t);
@@ -258,4 +264,8 @@ void        OpenSSL_add_all_algorithms(void);
 void   OpenSSL_add_all_algorithms_conf(void);
 void   OpenSSL_add_all_algorithms_noconf(void);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif /* HEIM_EVP_H */