diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-12-21 01:38:55 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-12-21 01:38:55 +0000 |
| commit | 3c07b4c2ee35181d8a02c56183b177f1c0010e2f (patch) | |
| tree | b52f2972e4405496c6602f9a7c6f234711660155 /crypto/asn1/tasn_dec.c | |
| parent | 1cc0b0a66a4197efb26c357a18f443608ed3d605 (diff) | |
Various Win32 related fixes. Doesn't compile yet on
Win32 but it is getting there...
Update mkdef.pl to handle ASN1_ANY and fix headers.
Stop various VC++ warnings.
Include some fixes from "Peter 'Luna' Runestig"
<peter@runestig.com>
Remove external declaration for des_set_weak_key_flag:
it doesn't exist.
Diffstat (limited to 'crypto/asn1/tasn_dec.c')
| -rw-r--r-- | crypto/asn1/tasn_dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c index 0caa8f6bd3..940e6af6b3 100644 --- a/crypto/asn1/tasn_dec.c +++ b/crypto/asn1/tasn_dec.c @@ -201,7 +201,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, unsigned char **in, long len, const ASN1 if(tag != -1) { p = *in; imphack = *p; - *p = (*p & V_ASN1_CONSTRUCTED) | it->utype; + *p = (unsigned char)((*p & V_ASN1_CONSTRUCTED) | it->utype); } ptmpval = cf->asn1_d2i(pval, in, len); @@ -315,7 +315,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, unsigned char **in, long len, const ASN1 * it increases efficiency in some cases. */ if(i == (it->tcount - 1)) isopt = 0; - else isopt = seqtt->flags & ASN1_TFLG_OPTIONAL; + else isopt = (char)(seqtt->flags & ASN1_TFLG_OPTIONAL); /* attempt to read in field, allowing each to be OPTIONAL */ ret = asn1_template_ex_d2i(pseqval, &p, len, seqtt, isopt, ctx); if(!ret) { |