projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add RFC 3779 support, contributed by ARIN.
[oweals/openssl.git]
/
crypto
/
asn1
/
asn1_mac.h
diff --git
a/crypto/asn1/asn1_mac.h
b/crypto/asn1/asn1_mac.h
index a67fb341eebd837b25f996e5f6314159d622fbf4..d958ca60d9dc26f154471051c51ff957dd30c6e3 100644
(file)
--- a/
crypto/asn1/asn1_mac.h
+++ b/
crypto/asn1/asn1_mac.h
@@
-126,12
+126,19
@@
err:\
(c.eos=ASN1_const_check_infinite_end(&c.p,c.slen)))
/* Don't use this with d2i_ASN1_BOOLEAN() */
(c.eos=ASN1_const_check_infinite_end(&c.p,c.slen)))
/* Don't use this with d2i_ASN1_BOOLEAN() */
-#define M_ASN1_D2I_get(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);
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; } \
+ c.slen-=(c.p-c.q);
+
/* use this instead () */
#define M_ASN1_D2I_get_int(b,func) \
c.q=c.p; \
/* use this instead () */
#define M_ASN1_D2I_get_int(b,func) \
c.q=c.p; \