ProbeStar/Cnomicon
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed asn.1 uper option bits

Browse Source
This commit is contained in:
Neal Probert
2024-07-17 10:30:39 -04:00
parent 083bb5a72e
commit e2eade1456
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libasn1/asn1uper.h
View File

@ -24,6 +24,8 @@
#define uper_get_bits_length(U,S) (uper_get_bits_stream(U,S)+1) #define uper_get_bits_length(U,S) (uper_get_bits_stream(U,S)+1)
#define uper_put_bits_length(U,L,S) uper_put_bits_stream(U,(L)-1,S) #define uper_put_bits_length(U,L,S) uper_put_bits_stream(U,(L)-1,S)
#define uper_get_seq_length(U,S) (uper_get_bits_stream(U,S)+1)
#define uper_init_extension(E) asn1_init_extension(E) #define uper_init_extension(E) asn1_init_extension(E)
#define uper_init_bitstream(E) asn1_init_bitstream(E) #define uper_init_bitstream(E) asn1_init_bitstream(E)

4
src/libasn1/uper_get_ext.c
View File

@ -74,8 +74,8 @@ uint uper_get_extension(UPER_Stream *uper, UPER_Extension *ext, uint noptions, u
// check for options // check for options
if (noptions) { if (noptions) {
ext->value = uper_get_bits_stream(uper, noptions);
ext->options = noptions; ext->options = noptions;
ext->value = uper_get_bits_stream(uper, noptions);
} }
else else
ext->options = 0; ext->options = 0;
@ -120,7 +120,7 @@ uint uper_get_ext_optional(UPER_Extension *ext, uint bit)
if (!ext || (bit>=ext->options)) if (!ext || (bit>=ext->options))
return 0; return 0;
return (ext->value & 1<<(ext->options-bit)); return (ext->value & 1<<(ext->options-bit-1));
} }
uint uper_get_ext_skip(UPER_Stream *uper, UPER_Extension *ext) uint uper_get_ext_skip(UPER_Stream *uper, UPER_Extension *ext)