Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
asn1c
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
asn1c
Commits
5ccf1eb5
Commit
5ccf1eb5
authored
Sep 24, 2004
by
Lev Walkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
context is now optional
parent
52559a2e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
31 deletions
+34
-31
skeletons/BOOLEAN.c
skeletons/BOOLEAN.c
+1
-3
skeletons/INTEGER.c
skeletons/INTEGER.c
+1
-3
skeletons/NativeInteger.c
skeletons/NativeInteger.c
+1
-3
skeletons/NativeReal.c
skeletons/NativeReal.c
+1
-3
skeletons/ber_decoder.c
skeletons/ber_decoder.c
+30
-19
No files found.
skeletons/BOOLEAN.c
View file @
5ccf1eb5
...
...
@@ -39,7 +39,6 @@ BOOLEAN_decode_ber(asn1_TYPE_descriptor_t *td,
int
tag_mode
)
{
BOOLEAN_t
*
st
=
(
BOOLEAN_t
*
)
*
bool_value
;
ber_dec_rval_t
rval
;
ber_dec_ctx_t
ctx
=
{
0
,
0
,
0
,
0
};
ber_tlv_len_t
length
;
ber_tlv_len_t
lidx
;
...
...
@@ -58,8 +57,7 @@ BOOLEAN_decode_ber(asn1_TYPE_descriptor_t *td,
/*
* Check tags.
*/
rval
=
ber_check_tags
(
td
,
&
ctx
,
buf_ptr
,
size
,
tag_mode
,
&
length
,
0
);
rval
=
ber_check_tags
(
td
,
0
,
buf_ptr
,
size
,
tag_mode
,
&
length
,
0
);
if
(
rval
.
code
!=
RC_OK
)
return
rval
;
...
...
skeletons/INTEGER.c
View file @
5ccf1eb5
...
...
@@ -40,7 +40,6 @@ INTEGER_decode_ber(asn1_TYPE_descriptor_t *td,
void
**
int_structure
,
void
*
buf_ptr
,
size_t
size
,
int
tag_mode
)
{
INTEGER_t
*
st
=
(
INTEGER_t
*
)
*
int_structure
;
ber_dec_rval_t
rval
;
ber_dec_ctx_t
ctx
=
{
0
,
0
,
0
,
0
};
ber_tlv_len_t
length
;
/*
...
...
@@ -61,8 +60,7 @@ INTEGER_decode_ber(asn1_TYPE_descriptor_t *td,
/*
* Check tags.
*/
rval
=
ber_check_tags
(
td
,
&
ctx
,
buf_ptr
,
size
,
tag_mode
,
&
length
,
0
);
rval
=
ber_check_tags
(
td
,
0
,
buf_ptr
,
size
,
tag_mode
,
&
length
,
0
);
if
(
rval
.
code
!=
RC_OK
)
return
rval
;
...
...
skeletons/NativeInteger.c
View file @
5ccf1eb5
...
...
@@ -47,7 +47,6 @@ NativeInteger_decode_ber(asn1_TYPE_descriptor_t *td,
void
**
int_ptr
,
void
*
buf_ptr
,
size_t
size
,
int
tag_mode
)
{
int
*
Int
=
(
int
*
)
*
int_ptr
;
ber_dec_rval_t
rval
;
ber_dec_ctx_t
ctx
=
{
0
,
0
,
0
,
0
};
ber_tlv_len_t
length
;
/*
...
...
@@ -68,8 +67,7 @@ NativeInteger_decode_ber(asn1_TYPE_descriptor_t *td,
/*
* Check tags.
*/
rval
=
ber_check_tags
(
td
,
&
ctx
,
buf_ptr
,
size
,
tag_mode
,
&
length
,
0
);
rval
=
ber_check_tags
(
td
,
0
,
buf_ptr
,
size
,
tag_mode
,
&
length
,
0
);
if
(
rval
.
code
!=
RC_OK
)
return
rval
;
...
...
skeletons/NativeReal.c
View file @
5ccf1eb5
...
...
@@ -48,7 +48,6 @@ NativeReal_decode_ber(asn1_TYPE_descriptor_t *td,
void
**
dbl_ptr
,
void
*
buf_ptr
,
size_t
size
,
int
tag_mode
)
{
double
*
Dbl
=
(
double
*
)
*
dbl_ptr
;
ber_dec_rval_t
rval
;
ber_dec_ctx_t
ctx
=
{
0
,
0
,
0
,
0
};
ber_tlv_len_t
length
;
/*
...
...
@@ -69,8 +68,7 @@ NativeReal_decode_ber(asn1_TYPE_descriptor_t *td,
/*
* Check tags.
*/
rval
=
ber_check_tags
(
td
,
&
ctx
,
buf_ptr
,
size
,
tag_mode
,
&
length
,
0
);
rval
=
ber_check_tags
(
td
,
0
,
buf_ptr
,
size
,
tag_mode
,
&
length
,
0
);
if
(
rval
.
code
!=
RC_OK
)
return
rval
;
...
...
skeletons/ber_decoder.c
View file @
5ccf1eb5
...
...
@@ -3,22 +3,25 @@
* Redistribution and modifications are permitted subject to BSD license.
*/
#include <asn_internal.h>
#include <constr_TYPE.h>
#include <assert.h>
#undef ADVANCE
#define ADVANCE(num_bytes) do { \
size_t num = num_bytes; \
ptr = ((char *)ptr) + num; \
size -= num; \
consumed_myself += num; \
#define ADVANCE(num_bytes) do {
\
size_t num = num_bytes;
\
ptr = ((char *)ptr) + num;
\
size -= num;
\
consumed_myself += num;
\
} while(0)
#undef RETURN
#define RETURN(_code) do { \
ber_dec_rval_t rval; \
rval.code = _code; \
rval.consumed = consumed_myself; \
return rval; \
#define RETURN(_code) do { \
ber_dec_rval_t rval; \
rval.code = _code; \
if(opt_ctx) opt_ctx->step = step;
/* Save context */
\
if(_code == RC_OK || opt_ctx) \
rval.consumed = consumed_myself; \
else \
rval.consumed = 0;
/* Context-free */
\
return rval; \
} while(0)
/*
...
...
@@ -42,7 +45,7 @@ ber_decode(asn1_TYPE_descriptor_t *type_descriptor,
* Check the set of <TL<TL<TL...>>> tags matches the definition.
*/
ber_dec_rval_t
ber_check_tags
(
asn1_TYPE_descriptor_t
*
td
,
ber_dec_ctx_t
*
ctx
,
ber_check_tags
(
asn1_TYPE_descriptor_t
*
td
,
ber_dec_ctx_t
*
opt_
ctx
,
void
*
ptr
,
size_t
size
,
int
tag_mode
,
ber_tlv_len_t
*
last_length
,
int
*
opt_tlv_form
)
{
ssize_t
consumed_myself
=
0
;
...
...
@@ -53,6 +56,7 @@ ber_check_tags(asn1_TYPE_descriptor_t *td, ber_dec_ctx_t *ctx,
ber_tlv_len_t
limit_len
=
-
1
;
int
expect_00_terminators
=
0
;
int
tlv_constr
=
-
1
;
/* If CHOICE, opt_tlv_form is not given */
int
step
=
opt_ctx
?
opt_ctx
->
step
:
0
;
/* Where we left previously */
int
tagno
;
/*
...
...
@@ -77,11 +81,11 @@ ber_check_tags(asn1_TYPE_descriptor_t *td, ber_dec_ctx_t *ctx,
* it appropriately.
*/
tagno
=
ctx
->
step
/* Continuing where left previously */
tagno
=
step
/* Continuing where left previously */
+
(
tag_mode
==
1
?-
1
:
0
)
;
ASN_DEBUG
(
"ber_check_tags(%s, size=%ld, tm=%d, step=%d, tagno=%d)"
,
td
->
name
,
(
long
)
size
,
tag_mode
,
ctx
->
step
,
tagno
);
td
->
name
,
(
long
)
size
,
tag_mode
,
step
,
tagno
);
//assert(td->tags_count >= 1); ?May not be the case for CHOICE or ANY.
if
(
tag_mode
==
0
&&
tagno
==
td
->
tags_count
)
{
...
...
@@ -102,23 +106,25 @@ ber_check_tags(asn1_TYPE_descriptor_t *td, ber_dec_ctx_t *ctx,
case
-
1
:
RETURN
(
RC_FAIL
);
case
0
:
RETURN
(
RC_WMORE
);
}
ASN_DEBUG
(
"Advancing %ld in ANY case"
,
(
long
)(
tag_len
+
len_len
));
ADVANCE
(
tag_len
+
len_len
);
}
else
{
assert
(
tagno
<
td
->
tags_count
);
/* At least one loop */
}
for
((
void
)
tagno
;
tagno
<
td
->
tags_count
;
tagno
++
,
ctx
->
step
++
)
{
for
((
void
)
tagno
;
tagno
<
td
->
tags_count
;
tagno
++
,
step
++
)
{
/*
* Fetch and process T from TLV.
*/
tag_len
=
ber_fetch_tag
(
ptr
,
size
,
&
tlv_tag
);
ASN_DEBUG
(
"Fetching tag from {%p,%ld} %02X..%02X: "
"len %ld, tag %s"
,
"len %ld,
step %d,
tag %s"
,
ptr
,
(
long
)
size
,
size
?*
(
uint8_t
*
)
ptr
:
0
,
((
size_t
)
tag_len
<
size
&&
tag_len
>
0
)
?*
((
uint8_t
*
)
ptr
+
tag_len
)
:
0
,
(
long
)
tag_len
,
(
long
)
tag_len
,
step
,
ber_tlv_tag_string
(
tlv_tag
));
switch
(
tag_len
)
{
case
-
1
:
RETURN
(
RC_FAIL
);
...
...
@@ -131,7 +137,7 @@ ber_check_tags(asn1_TYPE_descriptor_t *td, ber_dec_ctx_t *ctx,
* If {I}, don't check anything.
* If {I,B,C}, check B and C unless we're at I.
*/
if
(
tag_mode
!=
0
&&
ctx
->
step
==
0
)
{
if
(
tag_mode
!=
0
&&
step
==
0
)
{
/*
* We don't expect tag to match here.
* It's just because we don't know how the tag
...
...
@@ -158,11 +164,15 @@ ber_check_tags(asn1_TYPE_descriptor_t *td, ber_dec_ctx_t *ctx,
*/
if
(
tagno
<
(
td
->
tags_count
-
1
))
{
if
(
tlv_constr
==
0
)
{
ASN_DEBUG
(
"tlv_constr = %d, expfail"
,
tlv_constr
);
RETURN
(
RC_FAIL
);
}
}
else
{
if
(
td
->
last_tag_form
!=
tlv_constr
&&
td
->
last_tag_form
!=
-
1
)
{
ASN_DEBUG
(
"last_tag_form %d != %d"
,
td
->
last_tag_form
,
tlv_constr
);
RETURN
(
RC_FAIL
);
}
}
...
...
@@ -172,6 +182,7 @@ ber_check_tags(asn1_TYPE_descriptor_t *td, ber_dec_ctx_t *ctx,
*/
len_len
=
ber_fetch_length
(
tlv_constr
,
(
char
*
)
ptr
+
tag_len
,
size
-
tag_len
,
&
tlv_len
);
ASN_DEBUG
(
"Fetchinig len = %ld"
,
(
long
)
len_len
);
switch
(
len_len
)
{
case
-
1
:
RETURN
(
RC_FAIL
);
case
0
:
RETURN
(
RC_WMORE
);
...
...
@@ -227,7 +238,7 @@ ber_check_tags(asn1_TYPE_descriptor_t *td, ber_dec_ctx_t *ctx,
if
((
ssize_t
)
size
>
limit_len
)
{
/*
* Make sure that we won't consume more bytes
* from the
large buffer
than the inferred limit.
* from the
parent frame
than the inferred limit.
*/
size
=
limit_len
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment