summaryrefslogtreecommitdiffstats
path: root/crypto/ts/ts_asn1.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2015-05-07 23:41:07 -0400
committerRich Salz <rsalz@openssl.org>2015-09-22 00:40:31 -0400
commit18cd23df8a8f2edd800182e1ab62111e4b7f1dbe (patch)
tree06710877e9e087683be26e329c8328385f273573 /crypto/ts/ts_asn1.c
parentff03599a2f518dbdf13bca0bb0208e431b892fe9 (diff)
Remove "noise" comments from TS files.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/ts/ts_asn1.c')
-rw-r--r--crypto/ts/ts_asn1.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/crypto/ts/ts_asn1.c b/crypto/ts/ts_asn1.c
index 59cc8b272f..ba6c8d99d1 100644
--- a/crypto/ts/ts_asn1.c
+++ b/crypto/ts/ts_asn1.c
@@ -287,31 +287,22 @@ TS_TST_INFO *PKCS7_to_TS_TST_INFO(PKCS7 *token)
TSerr(TS_F_PKCS7_TO_TS_TST_INFO, TS_R_BAD_PKCS7_TYPE);
return NULL;
}
-
- /* Content must be present. */
if (PKCS7_get_detached(token)) {
TSerr(TS_F_PKCS7_TO_TS_TST_INFO, TS_R_DETACHED_CONTENT);
return NULL;
}
-
- /* We have a signed data with content. */
pkcs7_signed = token->d.sign;
enveloped = pkcs7_signed->contents;
if (OBJ_obj2nid(enveloped->type) != NID_id_smime_ct_TSTInfo) {
TSerr(TS_F_PKCS7_TO_TS_TST_INFO, TS_R_BAD_PKCS7_TYPE);
return NULL;
}
-
- /* We have a DER encoded TST_INFO as the signed data. */
tst_info_wrapper = enveloped->d.other;
if (tst_info_wrapper->type != V_ASN1_OCTET_STRING) {
TSerr(TS_F_PKCS7_TO_TS_TST_INFO, TS_R_BAD_TYPE);
return NULL;
}
-
- /* We have the correct ASN1_OCTET_STRING type. */
tst_info_der = tst_info_wrapper->value.octet_string;
- /* At last, decode the TST_INFO. */
p = tst_info_der->data;
return d2i_TS_TST_INFO(NULL, &p, tst_info_der->length);
}