aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/asn1/asn1_mac.h
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2000-06-08 11:00:37 +0000
committerRichard Levitte <levitte@openssl.org>2000-06-08 11:00:37 +0000
commitd44c7dcf002c8ee3d99e3387024871eddaf2f646 (patch)
treef9f32a92b13ff6ae76fc6f2c3e05a115c4e266ad /crypto/asn1/asn1_mac.h
parent5decfb7002045801b1cbc9a6ff5c99408727c4a7 (diff)
downloadopenssl-d44c7dcf002c8ee3d99e3387024871eddaf2f646.tar.gz
Merge in code from main trunk to BRANCH_engine.
Diffstat (limited to 'crypto/asn1/asn1_mac.h')
-rw-r--r--crypto/asn1/asn1_mac.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asn1/asn1_mac.h b/crypto/asn1/asn1_mac.h
index 653f5fe1c9..4512ba6cc6 100644
--- a/crypto/asn1/asn1_mac.h
+++ b/crypto/asn1/asn1_mac.h
@@ -340,7 +340,7 @@ err:\
/* New macros */
#define M_ASN1_New_Malloc(ret,type) \
- if ((ret=(type *)Malloc(sizeof(type))) == NULL) \
+ if ((ret=(type *)OPENSSL_malloc(sizeof(type))) == NULL) \
{ c.line=__LINE__; goto err2; }
#define M_ASN1_New(arg,func) \