Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
David Barchiesi
OpenLDAP
Commits
d2936fb1
Commit
d2936fb1
authored
Dec 14, 2020
by
Howard Chu
Browse files
ITS#9425 add more checks to ldap_X509dn2bv
parent
777098aa
Changes
1
Hide whitespace changes
Inline
Side-by-side
libraries/libldap/tls2.c
View file @
d2936fb1
...
...
@@ -1499,6 +1499,8 @@ ldap_X509dn2bv( void *x509_name, struct berval *bv, LDAPDN_rewrite_func *func,
for
(
tag
=
ber_first_element
(
ber
,
&
len
,
&
rdn_end
);
tag
==
LBER_SEQUENCE
;
tag
=
ber_next_element
(
ber
,
&
len
,
rdn_end
))
{
if
(
rdn_end
>
dn_end
)
return
LDAP_DECODING_ERROR
;
tag
=
ber_skip_tag
(
ber
,
&
len
);
ber_skip_data
(
ber
,
len
);
navas
++
;
...
...
@@ -1508,7 +1510,7 @@ ldap_X509dn2bv( void *x509_name, struct berval *bv, LDAPDN_rewrite_func *func,
/* Rewind and prepare to extract */
ber_rewind
(
ber
);
tag
=
ber_first_element
(
ber
,
&
len
,
&
dn_end
);
if
(
tag
=
=
LBER_
DEFAUL
T
)
if
(
tag
!
=
LBER_
SE
T
)
return
LDAP_DECODING_ERROR
;
/* Allocate the DN/RDN/AVA stuff as a single block */
...
...
@@ -1621,6 +1623,10 @@ allocd:
/* X.690 bitString value converted to RFC4517 Bit String */
rc
=
der_to_ldap_BitString
(
&
Val
,
&
newAVA
->
la_value
);
goto
allocd
;
case
LBER_DEFAULT
:
/* decode error */
rc
=
LDAP_DECODING_ERROR
;
goto
nomem
;
default:
/* Not a string type at all */
newAVA
->
la_flags
=
0
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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