26 lines
971 B
Diff
26 lines
971 B
Diff
From 0b4c1bbb77a75e6139e9d9e7c84c90fb650408e3 Mon Sep 17 00:00:00 2001
|
|
From: Howard Chu <hyc@openldap.org>
|
|
Date: Mon, 2 Nov 2020 13:12:10 +0000
|
|
Subject: [PATCH 1/2] ITS#9383 remove assert in certificateListValidate
|
|
|
|
---
|
|
servers/slapd/schema_init.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
|
|
index 6a512a286..cd979cc5a 100644
|
|
--- a/servers/slapd/schema_init.c
|
|
+++ b/servers/slapd/schema_init.c
|
|
@@ -371,8 +371,7 @@ certificateListValidate( Syntax *syntax, struct berval *in )
|
|
/* Optional version */
|
|
if ( tag == LBER_INTEGER ) {
|
|
tag = ber_get_int( ber, &version );
|
|
- assert( tag == LBER_INTEGER );
|
|
- if ( version != SLAP_X509_V2 ) return LDAP_INVALID_SYNTAX;
|
|
+ if ( tag != LBER_INTEGER || version != SLAP_X509_V2 ) return LDAP_INVALID_SYNTAX;
|
|
}
|
|
tag = ber_skip_tag( ber, &len ); /* Signature Algorithm */
|
|
if ( tag != LBER_SEQUENCE ) return LDAP_INVALID_SYNTAX;
|
|
--
|
|
2.29.2
|
|
|