denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OID_UNKNOWN (-1) requires int type

Browse Source
This commit is contained in:
Andreas Steffen
2007-09-11 17:33:37 +00:00
parent c1ff717690
commit dd968b9b20
6 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/ac.c
+2 -2
View File
@@ -618,9 +618,9 @@ static bool parse_certificate(chunk_t blob, private_x509ac_t *this)
bool critical; bool critical;
chunk_t object; chunk_t object;
u_int level; u_int level;
u_int type = OID_UNKNOWN;
u_int extn_oid = OID_UNKNOWN;
int objectID = 0; int objectID = 0;
int type = OID_UNKNOWN;
int extn_oid = OID_UNKNOWN;
asn1_init(&ctx, blob, 0, FALSE, FALSE); asn1_init(&ctx, blob, 0, FALSE, FALSE);
while (objectID < AC_OBJ_ROOF) while (objectID < AC_OBJ_ROOF)
src/libstrongswan/crypto/ocsp.c
+2 -3
View File
@@ -466,11 +466,11 @@ static chunk_t ocsp_build_request(private_ocsp_t *this)
static bool ocsp_parse_basic_response(chunk_t blob, int level0, response_t *res) static bool ocsp_parse_basic_response(chunk_t blob, int level0, response_t *res)
{ {
u_int level, version; u_int level, version;
u_int extn_oid = OID_UNKNOWN;
asn1_ctx_t ctx; asn1_ctx_t ctx;
bool critical; bool critical;
chunk_t object; chunk_t object;
int objectID = 0; int objectID = 0;
int extn_oid = OID_UNKNOWN;
asn1_init(&ctx, blob, level0, FALSE, FALSE); asn1_init(&ctx, blob, level0, FALSE, FALSE);
@@ -546,9 +546,8 @@ static response_status ocsp_parse_response(response_t *res)
chunk_t object; chunk_t object;
u_int level; u_int level;
int objectID = 0; int objectID = 0;
int ocspResponseType = OID_UNKNOWN;
response_status rStatus = STATUS_INTERNALERROR; response_status rStatus = STATUS_INTERNALERROR;
u_int ocspResponseType = OID_UNKNOWN;
asn1_init(&ctx, res->chunk, 0, FALSE, FALSE); asn1_init(&ctx, res->chunk, 0, FALSE, FALSE);
src/libstrongswan/crypto/x509.c
+3 -4
View File
@@ -453,8 +453,8 @@ parse_otherName(chunk_t blob, int level0)
{ {
asn1_ctx_t ctx; asn1_ctx_t ctx;
chunk_t object; chunk_t object;
int objectID = 0;
u_int level; u_int level;
int objectID = 0;
int oid = OID_UNKNOWN; int oid = OID_UNKNOWN;
asn1_init(&ctx, blob, level0, FALSE, FALSE); asn1_init(&ctx, blob, level0, FALSE, FALSE);
@@ -639,8 +639,7 @@ static void parse_authorityInfoAccess(chunk_t blob, int level0, linked_list_t *l
chunk_t object; chunk_t object;
u_int level; u_int level;
int objectID = 0; int objectID = 0;
int accessMethod = OID_UNKNOWN;
u_int accessMethod = OID_UNKNOWN;
asn1_init(&ctx, blob, level0, FALSE, FALSE); asn1_init(&ctx, blob, level0, FALSE, FALSE);
while (objectID < AUTH_INFO_ACCESS_ROOF) while (objectID < AUTH_INFO_ACCESS_ROOF)
@@ -759,8 +758,8 @@ static bool parse_certificate(chunk_t blob, u_int level0, private_x509_t *this)
bool critical; bool critical;
chunk_t object; chunk_t object;
u_int level; u_int level;
u_int extn_oid = OID_UNKNOWN;
int objectID = 0; int objectID = 0;
int extn_oid = OID_UNKNOWN;
asn1_init(&ctx, blob, level0, FALSE, FALSE); asn1_init(&ctx, blob, level0, FALSE, FALSE);
while (objectID < X509_OBJ_ROOF) while (objectID < X509_OBJ_ROOF)
src/pluto/ac.c
+2 -2
View File
@@ -460,9 +460,9 @@ parse_ac(chunk_t blob, x509acert_t *ac)
bool critical; bool critical;
chunk_t object; chunk_t object;
u_int level; u_int level;
u_int type = OID_UNKNOWN;
u_int extn_oid = OID_UNKNOWN;
int objectID = 0; int objectID = 0;
int type = OID_UNKNOWN;
int extn_oid = OID_UNKNOWN;
asn1_init(&ctx, blob, 0, FALSE, DBG_RAW); asn1_init(&ctx, blob, 0, FALSE, DBG_RAW);
src/pluto/ocsp.c
+4 -5
View File
@@ -1087,13 +1087,13 @@ valid_ocsp_response(response_t *res)
static bool static bool
parse_basic_ocsp_response(chunk_t blob, int level0, response_t *res) parse_basic_ocsp_response(chunk_t blob, int level0, response_t *res)
{ {
u_int level, version;
u_int extn_oid = OID_UNKNOWN;
u_char buf[BUF_LEN];
asn1_ctx_t ctx; asn1_ctx_t ctx;
bool critical; bool critical;
chunk_t object; chunk_t object;
u_int level, version;
u_char buf[BUF_LEN];
int objectID = 0; int objectID = 0;
int extn_oid = OID_UNKNOWN;
asn1_init(&ctx, blob, level0, FALSE, DBG_RAW); asn1_init(&ctx, blob, level0, FALSE, DBG_RAW);
@@ -1190,9 +1190,8 @@ parse_ocsp_response(chunk_t blob, response_t * res)
chunk_t object; chunk_t object;
u_int level; u_int level;
int objectID = 0; int objectID = 0;
int ocspResponseType = OID_UNKNOWN;
response_status rStatus = STATUS_INTERNALERROR; response_status rStatus = STATUS_INTERNALERROR;
u_int ocspResponseType = OID_UNKNOWN;
asn1_init(&ctx, blob, 0, FALSE, DBG_RAW); asn1_init(&ctx, blob, 0, FALSE, DBG_RAW);
src/pluto/x509.c
+2 -3
View File
@@ -1701,8 +1701,7 @@ parse_authorityInfoAccess(chunk_t blob, int level0, chunk_t *accessLocation)
chunk_t object; chunk_t object;
u_int level; u_int level;
int objectID = 0; int objectID = 0;
int accessMethod = OID_UNKNOWN;
u_int accessMethod = OID_UNKNOWN;
asn1_init(&ctx, blob, level0, FALSE, DBG_RAW); asn1_init(&ctx, blob, level0, FALSE, DBG_RAW);
@@ -1829,8 +1828,8 @@ parse_x509cert(chunk_t blob, u_int level0, x509cert_t *cert)
bool critical; bool critical;
chunk_t object; chunk_t object;
u_int level; u_int level;
u_int extn_oid = OID_UNKNOWN;
int objectID = 0; int objectID = 0;
int extn_oid = OID_UNKNOWN;
asn1_init(&ctx, blob, level0, FALSE, DBG_RAW); asn1_init(&ctx, blob, level0, FALSE, DBG_RAW);