Merge pull request #401 from libtom/pr/fix-der_length_custom_type

karel-m · web-flow · commit 504396764e19 · 2018-06-10T17:27:54.000+02:00
fix der_length_custom_type - incorrect length of length
diff --git a/src/pk/asn1/der/custom_type/der_length_custom_type.c b/src/pk/asn1/der/custom_type/der_length_custom_type.c
@@ -190,7 +190,7 @@ int der_length_custom_type(const ltc_asn1_list *root, unsigned long *outlen, uns
       }
    } else {
       /* calc length of length */
-      if ((err = der_length_asn1_length(y, &x)) != CRYPT_OK) {
+      if ((err = der_length_asn1_length(y - id_len, &x)) != CRYPT_OK) {
          goto LBL_ERR;
       }
       if (payloadlen != NULL) {

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ int der_length_custom_type(const ltc_asn1_list root, unsigned long outlen, uns`
`190`	`190`	`}`
`191`	`191`	`} else {`
`192`	`192`	`/* calc length of length */`
`193`		`- if ((err = der_length_asn1_length(y, &x)) != CRYPT_OK) {`
	`193`	`+ if ((err = der_length_asn1_length(y - id_len, &x)) != CRYPT_OK) {`
`194`	`194`	`goto LBL_ERR;`
`195`	`195`	`}`
`196`	`196`	`if (payloadlen != NULL) {`