From 38153d7b7a220b4ec11172699a62305f65a6c865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Tue, 29 Apr 2008 05:47:04 +0000 Subject: [PATCH] deprecate functions that are needed for exported EVP_MD_CTX. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23141 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/hcrypto/ChangeLog | 3 +++ lib/hcrypto/evp.c | 6 ++++-- lib/hcrypto/evp.h | 12 ++++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/hcrypto/ChangeLog b/lib/hcrypto/ChangeLog index 9a69c1a50..2daa222cb 100644 --- a/lib/hcrypto/ChangeLog +++ b/lib/hcrypto/ChangeLog @@ -1,5 +1,8 @@ 2008-04-28 Love Hörnquist Åstrand + * evp.[ch]: deprecate functions that are needed for exported + EVP_MD_CTX. + * evp.h: Internalize hc_EVP_MD_CTX. * evp.c: Internalize hc_EVP_MD_CTX. diff --git a/lib/hcrypto/evp.c b/lib/hcrypto/evp.c index c7fde43dd..1ff8c6047 100644 --- a/lib/hcrypto/evp.c +++ b/lib/hcrypto/evp.c @@ -37,6 +37,8 @@ RCSID("$Id$"); +#define HC_DEPRECATED + #include #include #include @@ -142,7 +144,7 @@ EVP_MD_CTX_create(void) * @ingroup hcrypto_evp */ -void +void HC_DEPRECATED EVP_MD_CTX_init(EVP_MD_CTX *ctx) { memset(ctx, 0, sizeof(*ctx)); @@ -173,7 +175,7 @@ EVP_MD_CTX_destroy(EVP_MD_CTX *ctx) * @ingroup hcrypto_evp */ -int +int HC_DEPRECATED EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx) { if (ctx->md && ctx->md->cleanup) diff --git a/lib/hcrypto/evp.h b/lib/hcrypto/evp.h index 5e24f9cf7..ccca7ebba 100644 --- a/lib/hcrypto/evp.h +++ b/lib/hcrypto/evp.h @@ -155,6 +155,14 @@ struct hc_CIPHER_CTX { unsigned char final[EVP_MAX_BLOCK_LENGTH]; }; +#if !defined(__GNUC__) && !defined(__attribute__) +#define __attribute__(x) +#endif + +#ifndef HC_DEPRECATED +#define HC_DEPRECATED __attribute__((deprecated)) +#endif + #ifdef __cplusplus extern "C" { #endif @@ -199,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);