diff options
author | djm <> | 2010-10-01 22:59:01 +0000 |
---|---|---|
committer | djm <> | 2010-10-01 22:59:01 +0000 |
commit | fe047d8b632246cb2db3234a0a4f32e5c318857b (patch) | |
tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/asn1/asn1_mac.h | |
parent | 2ea67f4aa254b09ded62e6e14fc893bbe6381579 (diff) | |
download | openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.gz openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.bz2 openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.zip |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/asn1/asn1_mac.h')
-rw-r--r-- | src/lib/libcrypto/asn1/asn1_mac.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/libcrypto/asn1/asn1_mac.h b/src/lib/libcrypto/asn1/asn1_mac.h index d958ca60d9..87bd0e9e1d 100644 --- a/src/lib/libcrypto/asn1/asn1_mac.h +++ b/src/lib/libcrypto/asn1/asn1_mac.h | |||
@@ -153,6 +153,13 @@ err:\ | |||
153 | M_ASN1_D2I_get(b,func); \ | 153 | M_ASN1_D2I_get(b,func); \ |
154 | } | 154 | } |
155 | 155 | ||
156 | #define M_ASN1_D2I_get_int_opt(b,func,type) \ | ||
157 | if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) \ | ||
158 | == (V_ASN1_UNIVERSAL|(type)))) \ | ||
159 | { \ | ||
160 | M_ASN1_D2I_get_int(b,func); \ | ||
161 | } | ||
162 | |||
156 | #define M_ASN1_D2I_get_imp(b,func, type) \ | 163 | #define M_ASN1_D2I_get_imp(b,func, type) \ |
157 | M_ASN1_next=(_tmp& V_ASN1_CONSTRUCTED)|type; \ | 164 | M_ASN1_next=(_tmp& V_ASN1_CONSTRUCTED)|type; \ |
158 | c.q=c.p; \ | 165 | c.q=c.p; \ |