diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2005-04-20 21:48:06 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2005-04-20 21:48:06 +0000 |
| commit | 2c45bf2bc9be4704c63b024d5721c1f537adb0f2 (patch) | |
| tree | ef7f30f18ea2cee15e32b2400b21cb296b8150ec /crypto/asn1/asn1_mac.h | |
| parent | 836ec0c76488d5056096d33c4868e3d4b9a3eac1 (diff) | |
| download | openssl-2c45bf2bc9be4704c63b024d5721c1f537adb0f2.tar.gz | |
Rename typed version of M_ASN1_get M_ASN1_get_x to avoid conflicts.
Remove more bogus shadow warnings.
Diffstat (limited to 'crypto/asn1/asn1_mac.h')
| -rw-r--r-- | crypto/asn1/asn1_mac.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crypto/asn1/asn1_mac.h b/crypto/asn1/asn1_mac.h index f95cb145b7..d958ca60d9 100644 --- a/crypto/asn1/asn1_mac.h +++ b/crypto/asn1/asn1_mac.h @@ -126,7 +126,14 @@ err:\ (c.eos=ASN1_const_check_infinite_end(&c.p,c.slen))) /* Don't use this with d2i_ASN1_BOOLEAN() */ -#define M_ASN1_D2I_get(type,b,func) \ +#define M_ASN1_D2I_get(b, func) \ + c.q=c.p; \ + if (func(&(b),&c.p,c.slen) == NULL) \ + {c.line=__LINE__; goto err; } \ + c.slen-=(c.p-c.q); + +/* Don't use this with d2i_ASN1_BOOLEAN() */ +#define M_ASN1_D2I_get_x(type,b,func) \ c.q=c.p; \ if (((D2I_OF(type))func)(&(b),&c.p,c.slen) == NULL) \ {c.line=__LINE__; goto err; } \ |