is a library to make the tasks of working with X.509 certificates, CMS data and related objects more easy.
| cms-parser.c (libksba-1.4.0.tar.bz2) | : | cms-parser.c (libksba-1.5.0.tar.bz2) |
|---|
| | |
| skipping to change at line 635 | | skipping to change at line 635 |
|---|
| expect_endtag = !!ti.ndef; | | expect_endtag = !!ti.ndef; |
| | |
| for (;;) | | for (;;) |
| { | | { |
| struct certlist_s *cl; | | struct certlist_s *cl; |
| | |
| /* First see whether this is really a sequence */ | | /* First see whether this is really a sequence */ |
| err = _ksba_ber_read_tl (cms->reader, &ti); | | err = _ksba_ber_read_tl (cms->reader, &ti); |
| if (err) | | if (err) |
| return err; | | return err; |
|
| if (expect_endtag && !ti.class && ti.tag == TYPE_NULL ) | | if (expect_endtag && !ti.class && !ti.tag) |
| { | | { |
| /* This is an end tag. Read the next tag but don't fail | | /* This is an end tag. Read the next tag but don't fail |
| if this is just an EOF. */ | | if this is just an EOF. */ |
| err = _ksba_ber_read_tl (cms->reader, &ti); | | err = _ksba_ber_read_tl (cms->reader, &ti); |
| if (err) | | if (err) |
| { | | { |
| if (gpg_err_code (err) == GPG_ERR_EOF) | | if (gpg_err_code (err) == GPG_ERR_EOF) |
| err = 0; | | err = 0; |
| return err; | | return err; |
| } | | } |
| | |
| skipping to change at line 695 | | skipping to change at line 695 |
|---|
| expect_endtag = !!ti.ndef; | | expect_endtag = !!ti.ndef; |
| | |
| /* FIXME this is just dummy read code */ | | /* FIXME this is just dummy read code */ |
| /* fprintf (stderr,"WARNING: Can't handle CRLs yet\n"); */ | | /* fprintf (stderr,"WARNING: Can't handle CRLs yet\n"); */ |
| for (;;) | | for (;;) |
| { | | { |
| /* first see whether this is really a sequence */ | | /* first see whether this is really a sequence */ |
| err = _ksba_ber_read_tl (cms->reader, &ti); | | err = _ksba_ber_read_tl (cms->reader, &ti); |
| if (err) | | if (err) |
| return err; | | return err; |
|
| if (expect_endtag && !ti.class && ti.tag == TYPE_NULL ) | | if (expect_endtag && !ti.class && !ti.tag) |
| { | | { |
| /* This is an end tag. Read the next tag but don't fail | | /* This is an end tag. Read the next tag but don't fail |
| if this is just an EOF. */ | | if this is just an EOF. */ |
| err = _ksba_ber_read_tl (cms->reader, &ti); | | err = _ksba_ber_read_tl (cms->reader, &ti); |
| if (err) | | if (err) |
| { | | { |
| if (gpg_err_code (err) == GPG_ERR_EOF) | | if (gpg_err_code (err) == GPG_ERR_EOF) |
| err = 0; | | err = 0; |
| return err; | | return err; |
| } | | } |
| | | |
| End of changes. 2 change blocks. |
|---|
| 2 lines changed or deleted | | 2 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 