mirror of
https://github.com/guanzhi/GmSSL.git
synced 2026-08-12 00:43:38 +08:00
update
This commit is contained in:
@@ -73,6 +73,8 @@ tags:
|
||||
lint:
|
||||
lint -DLINT $(INCLUDES) $(SRC)>fluff
|
||||
|
||||
update: depend
|
||||
|
||||
depend:
|
||||
$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
|
||||
|
||||
|
||||
817
crypto/ts/ts.h
817
crypto/ts/ts.h
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,6 @@
|
||||
/* crypto/ts/ts_asn1.c */
|
||||
/* Written by Nils Larsch for the OpenSSL project 2004.
|
||||
/*
|
||||
* Written by Nils Larsch for the OpenSSL project 2004.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
|
||||
@@ -9,7 +10,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -60,120 +61,124 @@
|
||||
#include <openssl/asn1t.h>
|
||||
|
||||
ASN1_SEQUENCE(TS_MSG_IMPRINT) = {
|
||||
ASN1_SIMPLE(TS_MSG_IMPRINT, hash_algo, X509_ALGOR),
|
||||
ASN1_SIMPLE(TS_MSG_IMPRINT, hashed_msg, ASN1_OCTET_STRING)
|
||||
ASN1_SIMPLE(TS_MSG_IMPRINT, hash_algo, X509_ALGOR),
|
||||
ASN1_SIMPLE(TS_MSG_IMPRINT, hashed_msg, ASN1_OCTET_STRING)
|
||||
} ASN1_SEQUENCE_END(TS_MSG_IMPRINT)
|
||||
|
||||
IMPLEMENT_ASN1_FUNCTIONS_const(TS_MSG_IMPRINT)
|
||||
IMPLEMENT_ASN1_DUP_FUNCTION(TS_MSG_IMPRINT)
|
||||
#ifndef OPENSSL_NO_BIO
|
||||
TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT **a)
|
||||
{
|
||||
return ASN1_d2i_bio_of(TS_MSG_IMPRINT, TS_MSG_IMPRINT_new, d2i_TS_MSG_IMPRINT, bp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_d2i_bio_of(TS_MSG_IMPRINT, TS_MSG_IMPRINT_new,
|
||||
d2i_TS_MSG_IMPRINT, bp, a);
|
||||
}
|
||||
|
||||
int i2d_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT *a)
|
||||
{
|
||||
return ASN1_i2d_bio_of_const(TS_MSG_IMPRINT, i2d_TS_MSG_IMPRINT, bp, a);
|
||||
return ASN1_i2d_bio_of_const(TS_MSG_IMPRINT, i2d_TS_MSG_IMPRINT, bp, a);
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_FP_API
|
||||
TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a)
|
||||
{
|
||||
return ASN1_d2i_fp_of(TS_MSG_IMPRINT, TS_MSG_IMPRINT_new, d2i_TS_MSG_IMPRINT, fp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_d2i_fp_of(TS_MSG_IMPRINT, TS_MSG_IMPRINT_new,
|
||||
d2i_TS_MSG_IMPRINT, fp, a);
|
||||
}
|
||||
|
||||
int i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a)
|
||||
{
|
||||
return ASN1_i2d_fp_of_const(TS_MSG_IMPRINT, i2d_TS_MSG_IMPRINT, fp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_i2d_fp_of_const(TS_MSG_IMPRINT, i2d_TS_MSG_IMPRINT, fp, a);
|
||||
}
|
||||
#endif
|
||||
|
||||
ASN1_SEQUENCE(TS_REQ) = {
|
||||
ASN1_SIMPLE(TS_REQ, version, ASN1_INTEGER),
|
||||
ASN1_SIMPLE(TS_REQ, msg_imprint, TS_MSG_IMPRINT),
|
||||
ASN1_OPT(TS_REQ, policy_id, ASN1_OBJECT),
|
||||
ASN1_OPT(TS_REQ, nonce, ASN1_INTEGER),
|
||||
ASN1_OPT(TS_REQ, cert_req, ASN1_FBOOLEAN),
|
||||
ASN1_IMP_SEQUENCE_OF_OPT(TS_REQ, extensions, X509_EXTENSION, 0)
|
||||
ASN1_SIMPLE(TS_REQ, version, ASN1_INTEGER),
|
||||
ASN1_SIMPLE(TS_REQ, msg_imprint, TS_MSG_IMPRINT),
|
||||
ASN1_OPT(TS_REQ, policy_id, ASN1_OBJECT),
|
||||
ASN1_OPT(TS_REQ, nonce, ASN1_INTEGER),
|
||||
ASN1_OPT(TS_REQ, cert_req, ASN1_FBOOLEAN),
|
||||
ASN1_IMP_SEQUENCE_OF_OPT(TS_REQ, extensions, X509_EXTENSION, 0)
|
||||
} ASN1_SEQUENCE_END(TS_REQ)
|
||||
|
||||
IMPLEMENT_ASN1_FUNCTIONS_const(TS_REQ)
|
||||
IMPLEMENT_ASN1_DUP_FUNCTION(TS_REQ)
|
||||
#ifndef OPENSSL_NO_BIO
|
||||
TS_REQ *d2i_TS_REQ_bio(BIO *bp, TS_REQ **a)
|
||||
{
|
||||
return ASN1_d2i_bio_of(TS_REQ, TS_REQ_new, d2i_TS_REQ, bp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_d2i_bio_of(TS_REQ, TS_REQ_new, d2i_TS_REQ, bp, a);
|
||||
}
|
||||
|
||||
int i2d_TS_REQ_bio(BIO *bp, TS_REQ *a)
|
||||
{
|
||||
return ASN1_i2d_bio_of_const(TS_REQ, i2d_TS_REQ, bp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_i2d_bio_of_const(TS_REQ, i2d_TS_REQ, bp, a);
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_FP_API
|
||||
TS_REQ *d2i_TS_REQ_fp(FILE *fp, TS_REQ **a)
|
||||
{
|
||||
return ASN1_d2i_fp_of(TS_REQ, TS_REQ_new, d2i_TS_REQ, fp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_d2i_fp_of(TS_REQ, TS_REQ_new, d2i_TS_REQ, fp, a);
|
||||
}
|
||||
|
||||
int i2d_TS_REQ_fp(FILE *fp, TS_REQ *a)
|
||||
{
|
||||
return ASN1_i2d_fp_of_const(TS_REQ, i2d_TS_REQ, fp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_i2d_fp_of_const(TS_REQ, i2d_TS_REQ, fp, a);
|
||||
}
|
||||
#endif
|
||||
|
||||
ASN1_SEQUENCE(TS_ACCURACY) = {
|
||||
ASN1_OPT(TS_ACCURACY, seconds, ASN1_INTEGER),
|
||||
ASN1_IMP_OPT(TS_ACCURACY, millis, ASN1_INTEGER, 0),
|
||||
ASN1_IMP_OPT(TS_ACCURACY, micros, ASN1_INTEGER, 1)
|
||||
ASN1_OPT(TS_ACCURACY, seconds, ASN1_INTEGER),
|
||||
ASN1_IMP_OPT(TS_ACCURACY, millis, ASN1_INTEGER, 0),
|
||||
ASN1_IMP_OPT(TS_ACCURACY, micros, ASN1_INTEGER, 1)
|
||||
} ASN1_SEQUENCE_END(TS_ACCURACY)
|
||||
|
||||
IMPLEMENT_ASN1_FUNCTIONS_const(TS_ACCURACY)
|
||||
IMPLEMENT_ASN1_DUP_FUNCTION(TS_ACCURACY)
|
||||
|
||||
ASN1_SEQUENCE(TS_TST_INFO) = {
|
||||
ASN1_SIMPLE(TS_TST_INFO, version, ASN1_INTEGER),
|
||||
ASN1_SIMPLE(TS_TST_INFO, policy_id, ASN1_OBJECT),
|
||||
ASN1_SIMPLE(TS_TST_INFO, msg_imprint, TS_MSG_IMPRINT),
|
||||
ASN1_SIMPLE(TS_TST_INFO, serial, ASN1_INTEGER),
|
||||
ASN1_SIMPLE(TS_TST_INFO, time, ASN1_GENERALIZEDTIME),
|
||||
ASN1_OPT(TS_TST_INFO, accuracy, TS_ACCURACY),
|
||||
ASN1_OPT(TS_TST_INFO, ordering, ASN1_FBOOLEAN),
|
||||
ASN1_OPT(TS_TST_INFO, nonce, ASN1_INTEGER),
|
||||
ASN1_EXP_OPT(TS_TST_INFO, tsa, GENERAL_NAME, 0),
|
||||
ASN1_IMP_SEQUENCE_OF_OPT(TS_TST_INFO, extensions, X509_EXTENSION, 1)
|
||||
ASN1_SIMPLE(TS_TST_INFO, version, ASN1_INTEGER),
|
||||
ASN1_SIMPLE(TS_TST_INFO, policy_id, ASN1_OBJECT),
|
||||
ASN1_SIMPLE(TS_TST_INFO, msg_imprint, TS_MSG_IMPRINT),
|
||||
ASN1_SIMPLE(TS_TST_INFO, serial, ASN1_INTEGER),
|
||||
ASN1_SIMPLE(TS_TST_INFO, time, ASN1_GENERALIZEDTIME),
|
||||
ASN1_OPT(TS_TST_INFO, accuracy, TS_ACCURACY),
|
||||
ASN1_OPT(TS_TST_INFO, ordering, ASN1_FBOOLEAN),
|
||||
ASN1_OPT(TS_TST_INFO, nonce, ASN1_INTEGER),
|
||||
ASN1_EXP_OPT(TS_TST_INFO, tsa, GENERAL_NAME, 0),
|
||||
ASN1_IMP_SEQUENCE_OF_OPT(TS_TST_INFO, extensions, X509_EXTENSION, 1)
|
||||
} ASN1_SEQUENCE_END(TS_TST_INFO)
|
||||
|
||||
IMPLEMENT_ASN1_FUNCTIONS_const(TS_TST_INFO)
|
||||
IMPLEMENT_ASN1_DUP_FUNCTION(TS_TST_INFO)
|
||||
#ifndef OPENSSL_NO_BIO
|
||||
TS_TST_INFO *d2i_TS_TST_INFO_bio(BIO *bp, TS_TST_INFO **a)
|
||||
{
|
||||
return ASN1_d2i_bio_of(TS_TST_INFO, TS_TST_INFO_new, d2i_TS_TST_INFO, bp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_d2i_bio_of(TS_TST_INFO, TS_TST_INFO_new, d2i_TS_TST_INFO, bp,
|
||||
a);
|
||||
}
|
||||
|
||||
int i2d_TS_TST_INFO_bio(BIO *bp, TS_TST_INFO *a)
|
||||
{
|
||||
return ASN1_i2d_bio_of_const(TS_TST_INFO, i2d_TS_TST_INFO, bp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_i2d_bio_of_const(TS_TST_INFO, i2d_TS_TST_INFO, bp, a);
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_FP_API
|
||||
TS_TST_INFO *d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a)
|
||||
{
|
||||
return ASN1_d2i_fp_of(TS_TST_INFO, TS_TST_INFO_new, d2i_TS_TST_INFO, fp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_d2i_fp_of(TS_TST_INFO, TS_TST_INFO_new, d2i_TS_TST_INFO, fp,
|
||||
a);
|
||||
}
|
||||
|
||||
int i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a)
|
||||
{
|
||||
return ASN1_i2d_fp_of_const(TS_TST_INFO, i2d_TS_TST_INFO, fp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_i2d_fp_of_const(TS_TST_INFO, i2d_TS_TST_INFO, fp, a);
|
||||
}
|
||||
#endif
|
||||
|
||||
ASN1_SEQUENCE(TS_STATUS_INFO) = {
|
||||
ASN1_SIMPLE(TS_STATUS_INFO, status, ASN1_INTEGER),
|
||||
ASN1_SEQUENCE_OF_OPT(TS_STATUS_INFO, text, ASN1_UTF8STRING),
|
||||
ASN1_OPT(TS_STATUS_INFO, failure_info, ASN1_BIT_STRING)
|
||||
ASN1_SIMPLE(TS_STATUS_INFO, status, ASN1_INTEGER),
|
||||
ASN1_SEQUENCE_OF_OPT(TS_STATUS_INFO, text, ASN1_UTF8STRING),
|
||||
ASN1_OPT(TS_STATUS_INFO, failure_info, ASN1_BIT_STRING)
|
||||
} ASN1_SEQUENCE_END(TS_STATUS_INFO)
|
||||
|
||||
IMPLEMENT_ASN1_FUNCTIONS_const(TS_STATUS_INFO)
|
||||
@@ -181,95 +186,98 @@ IMPLEMENT_ASN1_DUP_FUNCTION(TS_STATUS_INFO)
|
||||
|
||||
static int ts_resp_set_tst_info(TS_RESP *a)
|
||||
{
|
||||
long status;
|
||||
long status;
|
||||
|
||||
status = ASN1_INTEGER_get(a->status_info->status);
|
||||
status = ASN1_INTEGER_get(a->status_info->status);
|
||||
|
||||
if (a->token) {
|
||||
if (status != 0 && status != 1) {
|
||||
TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_TOKEN_PRESENT);
|
||||
return 0;
|
||||
}
|
||||
if (a->tst_info != NULL)
|
||||
TS_TST_INFO_free(a->tst_info);
|
||||
a->tst_info = PKCS7_to_TS_TST_INFO(a->token);
|
||||
if (!a->tst_info) {
|
||||
TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_PKCS7_TO_TS_TST_INFO_FAILED);
|
||||
return 0;
|
||||
}
|
||||
} else if (status == 0 || status == 1) {
|
||||
TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_TOKEN_NOT_PRESENT);
|
||||
return 0;
|
||||
}
|
||||
if (a->token) {
|
||||
if (status != 0 && status != 1) {
|
||||
TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_TOKEN_PRESENT);
|
||||
return 0;
|
||||
}
|
||||
if (a->tst_info != NULL)
|
||||
TS_TST_INFO_free(a->tst_info);
|
||||
a->tst_info = PKCS7_to_TS_TST_INFO(a->token);
|
||||
if (!a->tst_info) {
|
||||
TSerr(TS_F_TS_RESP_SET_TST_INFO,
|
||||
TS_R_PKCS7_TO_TS_TST_INFO_FAILED);
|
||||
return 0;
|
||||
}
|
||||
} else if (status == 0 || status == 1) {
|
||||
TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_TOKEN_NOT_PRESENT);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int ts_resp_cb(int op, ASN1_VALUE **pval, const ASN1_ITEM *it,
|
||||
void *exarg)
|
||||
void *exarg)
|
||||
{
|
||||
TS_RESP *ts_resp = (TS_RESP *)*pval;
|
||||
if (op == ASN1_OP_NEW_POST) {
|
||||
ts_resp->tst_info = NULL;
|
||||
} else if (op == ASN1_OP_FREE_POST) {
|
||||
if (ts_resp->tst_info != NULL)
|
||||
TS_TST_INFO_free(ts_resp->tst_info);
|
||||
} else if (op == ASN1_OP_D2I_POST) {
|
||||
if (ts_resp_set_tst_info(ts_resp) == 0)
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
TS_RESP *ts_resp = (TS_RESP *)*pval;
|
||||
if (op == ASN1_OP_NEW_POST) {
|
||||
ts_resp->tst_info = NULL;
|
||||
} else if (op == ASN1_OP_FREE_POST) {
|
||||
if (ts_resp->tst_info != NULL)
|
||||
TS_TST_INFO_free(ts_resp->tst_info);
|
||||
} else if (op == ASN1_OP_D2I_POST) {
|
||||
if (ts_resp_set_tst_info(ts_resp) == 0)
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
ASN1_SEQUENCE_cb(TS_RESP, ts_resp_cb) = {
|
||||
ASN1_SIMPLE(TS_RESP, status_info, TS_STATUS_INFO),
|
||||
ASN1_OPT(TS_RESP, token, PKCS7),
|
||||
ASN1_SIMPLE(TS_RESP, status_info, TS_STATUS_INFO),
|
||||
ASN1_OPT(TS_RESP, token, PKCS7),
|
||||
} ASN1_SEQUENCE_END_cb(TS_RESP, TS_RESP)
|
||||
|
||||
IMPLEMENT_ASN1_FUNCTIONS_const(TS_RESP)
|
||||
|
||||
IMPLEMENT_ASN1_DUP_FUNCTION(TS_RESP)
|
||||
|
||||
#ifndef OPENSSL_NO_BIO
|
||||
TS_RESP *d2i_TS_RESP_bio(BIO *bp, TS_RESP **a)
|
||||
{
|
||||
return ASN1_d2i_bio_of(TS_RESP, TS_RESP_new, d2i_TS_RESP, bp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_d2i_bio_of(TS_RESP, TS_RESP_new, d2i_TS_RESP, bp, a);
|
||||
}
|
||||
|
||||
int i2d_TS_RESP_bio(BIO *bp, TS_RESP *a)
|
||||
{
|
||||
return ASN1_i2d_bio_of_const(TS_RESP, i2d_TS_RESP, bp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_i2d_bio_of_const(TS_RESP, i2d_TS_RESP, bp, a);
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_FP_API
|
||||
TS_RESP *d2i_TS_RESP_fp(FILE *fp, TS_RESP **a)
|
||||
{
|
||||
return ASN1_d2i_fp_of(TS_RESP, TS_RESP_new, d2i_TS_RESP, fp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_d2i_fp_of(TS_RESP, TS_RESP_new, d2i_TS_RESP, fp, a);
|
||||
}
|
||||
|
||||
int i2d_TS_RESP_fp(FILE *fp, TS_RESP *a)
|
||||
{
|
||||
return ASN1_i2d_fp_of_const(TS_RESP, i2d_TS_RESP, fp, a);
|
||||
}
|
||||
{
|
||||
return ASN1_i2d_fp_of_const(TS_RESP, i2d_TS_RESP, fp, a);
|
||||
}
|
||||
#endif
|
||||
|
||||
ASN1_SEQUENCE(ESS_ISSUER_SERIAL) = {
|
||||
ASN1_SEQUENCE_OF(ESS_ISSUER_SERIAL, issuer, GENERAL_NAME),
|
||||
ASN1_SIMPLE(ESS_ISSUER_SERIAL, serial, ASN1_INTEGER)
|
||||
ASN1_SEQUENCE_OF(ESS_ISSUER_SERIAL, issuer, GENERAL_NAME),
|
||||
ASN1_SIMPLE(ESS_ISSUER_SERIAL, serial, ASN1_INTEGER)
|
||||
} ASN1_SEQUENCE_END(ESS_ISSUER_SERIAL)
|
||||
|
||||
IMPLEMENT_ASN1_FUNCTIONS_const(ESS_ISSUER_SERIAL)
|
||||
IMPLEMENT_ASN1_DUP_FUNCTION(ESS_ISSUER_SERIAL)
|
||||
|
||||
ASN1_SEQUENCE(ESS_CERT_ID) = {
|
||||
ASN1_SIMPLE(ESS_CERT_ID, hash, ASN1_OCTET_STRING),
|
||||
ASN1_OPT(ESS_CERT_ID, issuer_serial, ESS_ISSUER_SERIAL)
|
||||
ASN1_SIMPLE(ESS_CERT_ID, hash, ASN1_OCTET_STRING),
|
||||
ASN1_OPT(ESS_CERT_ID, issuer_serial, ESS_ISSUER_SERIAL)
|
||||
} ASN1_SEQUENCE_END(ESS_CERT_ID)
|
||||
|
||||
IMPLEMENT_ASN1_FUNCTIONS_const(ESS_CERT_ID)
|
||||
IMPLEMENT_ASN1_DUP_FUNCTION(ESS_CERT_ID)
|
||||
|
||||
ASN1_SEQUENCE(ESS_SIGNING_CERT) = {
|
||||
ASN1_SEQUENCE_OF(ESS_SIGNING_CERT, cert_ids, ESS_CERT_ID),
|
||||
ASN1_SEQUENCE_OF_OPT(ESS_SIGNING_CERT, policy_info, POLICYINFO)
|
||||
ASN1_SEQUENCE_OF(ESS_SIGNING_CERT, cert_ids, ESS_CERT_ID),
|
||||
ASN1_SEQUENCE_OF_OPT(ESS_SIGNING_CERT, policy_info, POLICYINFO)
|
||||
} ASN1_SEQUENCE_END(ESS_SIGNING_CERT)
|
||||
|
||||
IMPLEMENT_ASN1_FUNCTIONS_const(ESS_SIGNING_CERT)
|
||||
@@ -278,45 +286,41 @@ IMPLEMENT_ASN1_DUP_FUNCTION(ESS_SIGNING_CERT)
|
||||
/* Getting encapsulated TS_TST_INFO object from PKCS7. */
|
||||
TS_TST_INFO *PKCS7_to_TS_TST_INFO(PKCS7 *token)
|
||||
{
|
||||
PKCS7_SIGNED *pkcs7_signed;
|
||||
PKCS7 *enveloped;
|
||||
ASN1_TYPE *tst_info_wrapper;
|
||||
ASN1_OCTET_STRING *tst_info_der;
|
||||
const unsigned char *p;
|
||||
PKCS7_SIGNED *pkcs7_signed;
|
||||
PKCS7 *enveloped;
|
||||
ASN1_TYPE *tst_info_wrapper;
|
||||
ASN1_OCTET_STRING *tst_info_der;
|
||||
const unsigned char *p;
|
||||
|
||||
if (!PKCS7_type_is_signed(token))
|
||||
{
|
||||
TSerr(TS_F_PKCS7_TO_TS_TST_INFO, TS_R_BAD_PKCS7_TYPE);
|
||||
return NULL;
|
||||
}
|
||||
if (!PKCS7_type_is_signed(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;
|
||||
}
|
||||
/* 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 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 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);
|
||||
/* 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);
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -1,6 +1,7 @@
|
||||
/* crypto/ts/ts_conf.c */
|
||||
/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
|
||||
* project 2002.
|
||||
/*
|
||||
* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL project
|
||||
* 2002.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
|
||||
@@ -10,7 +11,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -62,446 +63,429 @@
|
||||
#include "cryptlib.h"
|
||||
#include <openssl/pem.h>
|
||||
#ifndef OPENSSL_NO_ENGINE
|
||||
#include <openssl/engine.h>
|
||||
# include <openssl/engine.h>
|
||||
#endif
|
||||
#include <openssl/ts.h>
|
||||
|
||||
/* Macro definitions for the configuration file. */
|
||||
|
||||
#define BASE_SECTION "tsa"
|
||||
#define ENV_DEFAULT_TSA "default_tsa"
|
||||
#define ENV_SERIAL "serial"
|
||||
#define ENV_CRYPTO_DEVICE "crypto_device"
|
||||
#define ENV_SIGNER_CERT "signer_cert"
|
||||
#define ENV_CERTS "certs"
|
||||
#define ENV_SIGNER_KEY "signer_key"
|
||||
#define ENV_DEFAULT_POLICY "default_policy"
|
||||
#define ENV_OTHER_POLICIES "other_policies"
|
||||
#define ENV_DIGESTS "digests"
|
||||
#define ENV_ACCURACY "accuracy"
|
||||
#define ENV_ORDERING "ordering"
|
||||
#define ENV_TSA_NAME "tsa_name"
|
||||
#define ENV_ESS_CERT_ID_CHAIN "ess_cert_id_chain"
|
||||
#define ENV_VALUE_SECS "secs"
|
||||
#define ENV_VALUE_MILLISECS "millisecs"
|
||||
#define ENV_VALUE_MICROSECS "microsecs"
|
||||
#define ENV_CLOCK_PRECISION_DIGITS "clock_precision_digits"
|
||||
#define ENV_VALUE_YES "yes"
|
||||
#define ENV_VALUE_NO "no"
|
||||
#define BASE_SECTION "tsa"
|
||||
#define ENV_DEFAULT_TSA "default_tsa"
|
||||
#define ENV_SERIAL "serial"
|
||||
#define ENV_CRYPTO_DEVICE "crypto_device"
|
||||
#define ENV_SIGNER_CERT "signer_cert"
|
||||
#define ENV_CERTS "certs"
|
||||
#define ENV_SIGNER_KEY "signer_key"
|
||||
#define ENV_DEFAULT_POLICY "default_policy"
|
||||
#define ENV_OTHER_POLICIES "other_policies"
|
||||
#define ENV_DIGESTS "digests"
|
||||
#define ENV_ACCURACY "accuracy"
|
||||
#define ENV_ORDERING "ordering"
|
||||
#define ENV_TSA_NAME "tsa_name"
|
||||
#define ENV_ESS_CERT_ID_CHAIN "ess_cert_id_chain"
|
||||
#define ENV_VALUE_SECS "secs"
|
||||
#define ENV_VALUE_MILLISECS "millisecs"
|
||||
#define ENV_VALUE_MICROSECS "microsecs"
|
||||
#define ENV_CLOCK_PRECISION_DIGITS "clock_precision_digits"
|
||||
#define ENV_VALUE_YES "yes"
|
||||
#define ENV_VALUE_NO "no"
|
||||
|
||||
/* Function definitions for certificate and key loading. */
|
||||
|
||||
X509 *TS_CONF_load_cert(const char *file)
|
||||
{
|
||||
BIO *cert = NULL;
|
||||
X509 *x = NULL;
|
||||
{
|
||||
BIO *cert = NULL;
|
||||
X509 *x = NULL;
|
||||
|
||||
if ((cert = BIO_new_file(file, "r")) == NULL) goto end;
|
||||
x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);
|
||||
end:
|
||||
if (x == NULL)
|
||||
fprintf(stderr, "unable to load certificate: %s\n", file);
|
||||
BIO_free(cert);
|
||||
return x;
|
||||
}
|
||||
if ((cert = BIO_new_file(file, "r")) == NULL)
|
||||
goto end;
|
||||
x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);
|
||||
end:
|
||||
if (x == NULL)
|
||||
fprintf(stderr, "unable to load certificate: %s\n", file);
|
||||
BIO_free(cert);
|
||||
return x;
|
||||
}
|
||||
|
||||
STACK_OF(X509) *TS_CONF_load_certs(const char *file)
|
||||
{
|
||||
BIO *certs = NULL;
|
||||
STACK_OF(X509) *othercerts = NULL;
|
||||
STACK_OF(X509_INFO) *allcerts = NULL;
|
||||
int i;
|
||||
{
|
||||
BIO *certs = NULL;
|
||||
STACK_OF(X509) *othercerts = NULL;
|
||||
STACK_OF(X509_INFO) *allcerts = NULL;
|
||||
int i;
|
||||
|
||||
if (!(certs = BIO_new_file(file, "r"))) goto end;
|
||||
if (!(certs = BIO_new_file(file, "r")))
|
||||
goto end;
|
||||
|
||||
if (!(othercerts = sk_X509_new_null())) goto end;
|
||||
allcerts = PEM_X509_INFO_read_bio(certs, NULL, NULL, NULL);
|
||||
for(i = 0; i < sk_X509_INFO_num(allcerts); i++)
|
||||
{
|
||||
X509_INFO *xi = sk_X509_INFO_value(allcerts, i);
|
||||
if (xi->x509)
|
||||
{
|
||||
sk_X509_push(othercerts, xi->x509);
|
||||
xi->x509 = NULL;
|
||||
}
|
||||
}
|
||||
end:
|
||||
if (othercerts == NULL)
|
||||
fprintf(stderr, "unable to load certificates: %s\n", file);
|
||||
sk_X509_INFO_pop_free(allcerts, X509_INFO_free);
|
||||
BIO_free(certs);
|
||||
return othercerts;
|
||||
}
|
||||
if (!(othercerts = sk_X509_new_null()))
|
||||
goto end;
|
||||
allcerts = PEM_X509_INFO_read_bio(certs, NULL, NULL, NULL);
|
||||
for (i = 0; i < sk_X509_INFO_num(allcerts); i++) {
|
||||
X509_INFO *xi = sk_X509_INFO_value(allcerts, i);
|
||||
if (xi->x509) {
|
||||
sk_X509_push(othercerts, xi->x509);
|
||||
xi->x509 = NULL;
|
||||
}
|
||||
}
|
||||
end:
|
||||
if (othercerts == NULL)
|
||||
fprintf(stderr, "unable to load certificates: %s\n", file);
|
||||
sk_X509_INFO_pop_free(allcerts, X509_INFO_free);
|
||||
BIO_free(certs);
|
||||
return othercerts;
|
||||
}
|
||||
|
||||
EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass)
|
||||
{
|
||||
BIO *key = NULL;
|
||||
EVP_PKEY *pkey = NULL;
|
||||
{
|
||||
BIO *key = NULL;
|
||||
EVP_PKEY *pkey = NULL;
|
||||
|
||||
if (!(key = BIO_new_file(file, "r"))) goto end;
|
||||
pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, (char *) pass);
|
||||
if (!(key = BIO_new_file(file, "r")))
|
||||
goto end;
|
||||
pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, (char *)pass);
|
||||
end:
|
||||
if (pkey == NULL)
|
||||
fprintf(stderr, "unable to load private key: %s\n", file);
|
||||
BIO_free(key);
|
||||
return pkey;
|
||||
}
|
||||
if (pkey == NULL)
|
||||
fprintf(stderr, "unable to load private key: %s\n", file);
|
||||
BIO_free(key);
|
||||
return pkey;
|
||||
}
|
||||
|
||||
/* Function definitions for handling configuration options. */
|
||||
|
||||
static void TS_CONF_lookup_fail(const char *name, const char *tag)
|
||||
{
|
||||
fprintf(stderr, "variable lookup failed for %s::%s\n", name, tag);
|
||||
}
|
||||
{
|
||||
fprintf(stderr, "variable lookup failed for %s::%s\n", name, tag);
|
||||
}
|
||||
|
||||
static void TS_CONF_invalid(const char *name, const char *tag)
|
||||
{
|
||||
fprintf(stderr, "invalid variable value for %s::%s\n", name, tag);
|
||||
}
|
||||
{
|
||||
fprintf(stderr, "invalid variable value for %s::%s\n", name, tag);
|
||||
}
|
||||
|
||||
const char *TS_CONF_get_tsa_section(CONF *conf, const char *section)
|
||||
{
|
||||
if (!section)
|
||||
{
|
||||
section = NCONF_get_string(conf, BASE_SECTION, ENV_DEFAULT_TSA);
|
||||
if (!section)
|
||||
TS_CONF_lookup_fail(BASE_SECTION, ENV_DEFAULT_TSA);
|
||||
}
|
||||
return section;
|
||||
}
|
||||
{
|
||||
if (!section) {
|
||||
section = NCONF_get_string(conf, BASE_SECTION, ENV_DEFAULT_TSA);
|
||||
if (!section)
|
||||
TS_CONF_lookup_fail(BASE_SECTION, ENV_DEFAULT_TSA);
|
||||
}
|
||||
return section;
|
||||
}
|
||||
|
||||
int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,
|
||||
TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
char *serial = NCONF_get_string(conf, section, ENV_SERIAL);
|
||||
if (!serial)
|
||||
{
|
||||
TS_CONF_lookup_fail(section, ENV_SERIAL);
|
||||
goto err;
|
||||
}
|
||||
TS_RESP_CTX_set_serial_cb(ctx, cb, serial);
|
||||
TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
char *serial = NCONF_get_string(conf, section, ENV_SERIAL);
|
||||
if (!serial) {
|
||||
TS_CONF_lookup_fail(section, ENV_SERIAL);
|
||||
goto err;
|
||||
}
|
||||
TS_RESP_CTX_set_serial_cb(ctx, cb, serial);
|
||||
|
||||
ret = 1;
|
||||
ret = 1;
|
||||
err:
|
||||
return ret;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_ENGINE
|
||||
|
||||
int TS_CONF_set_crypto_device(CONF *conf, const char *section,
|
||||
const char *device)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
if (!device)
|
||||
device = NCONF_get_string(conf, section,
|
||||
ENV_CRYPTO_DEVICE);
|
||||
const char *device)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
if (device && !TS_CONF_set_default_engine(device))
|
||||
{
|
||||
TS_CONF_invalid(section, ENV_CRYPTO_DEVICE);
|
||||
goto err;
|
||||
}
|
||||
ret = 1;
|
||||
if (!device)
|
||||
device = NCONF_get_string(conf, section, ENV_CRYPTO_DEVICE);
|
||||
|
||||
if (device && !TS_CONF_set_default_engine(device)) {
|
||||
TS_CONF_invalid(section, ENV_CRYPTO_DEVICE);
|
||||
goto err;
|
||||
}
|
||||
ret = 1;
|
||||
err:
|
||||
return ret;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
int TS_CONF_set_default_engine(const char *name)
|
||||
{
|
||||
ENGINE *e = NULL;
|
||||
int ret = 0;
|
||||
{
|
||||
ENGINE *e = NULL;
|
||||
int ret = 0;
|
||||
|
||||
/* Leave the default if builtin specified. */
|
||||
if (strcmp(name, "builtin") == 0) return 1;
|
||||
/* Leave the default if builtin specified. */
|
||||
if (strcmp(name, "builtin") == 0)
|
||||
return 1;
|
||||
|
||||
if (!(e = ENGINE_by_id(name))) goto err;
|
||||
/* Enable the use of the NCipher HSM for forked children. */
|
||||
if (strcmp(name, "chil") == 0)
|
||||
ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
|
||||
/* All the operations are going to be carried out by the engine. */
|
||||
if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) goto err;
|
||||
ret = 1;
|
||||
if (!(e = ENGINE_by_id(name)))
|
||||
goto err;
|
||||
/* Enable the use of the NCipher HSM for forked children. */
|
||||
if (strcmp(name, "chil") == 0)
|
||||
ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
|
||||
/* All the operations are going to be carried out by the engine. */
|
||||
if (!ENGINE_set_default(e, ENGINE_METHOD_ALL))
|
||||
goto err;
|
||||
ret = 1;
|
||||
err:
|
||||
if (!ret)
|
||||
{
|
||||
TSerr(TS_F_TS_CONF_SET_DEFAULT_ENGINE,
|
||||
TS_R_COULD_NOT_SET_ENGINE);
|
||||
ERR_add_error_data(2, "engine:", name);
|
||||
}
|
||||
if (e) ENGINE_free(e);
|
||||
return ret;
|
||||
}
|
||||
if (!ret) {
|
||||
TSerr(TS_F_TS_CONF_SET_DEFAULT_ENGINE, TS_R_COULD_NOT_SET_ENGINE);
|
||||
ERR_add_error_data(2, "engine:", name);
|
||||
}
|
||||
if (e)
|
||||
ENGINE_free(e);
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
int TS_CONF_set_signer_cert(CONF *conf, const char *section,
|
||||
const char *cert, TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
X509 *cert_obj = NULL;
|
||||
if (!cert)
|
||||
cert = NCONF_get_string(conf, section, ENV_SIGNER_CERT);
|
||||
if (!cert)
|
||||
{
|
||||
TS_CONF_lookup_fail(section, ENV_SIGNER_CERT);
|
||||
goto err;
|
||||
}
|
||||
if (!(cert_obj = TS_CONF_load_cert(cert)))
|
||||
goto err;
|
||||
if (!TS_RESP_CTX_set_signer_cert(ctx, cert_obj))
|
||||
goto err;
|
||||
const char *cert, TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
X509 *cert_obj = NULL;
|
||||
if (!cert)
|
||||
cert = NCONF_get_string(conf, section, ENV_SIGNER_CERT);
|
||||
if (!cert) {
|
||||
TS_CONF_lookup_fail(section, ENV_SIGNER_CERT);
|
||||
goto err;
|
||||
}
|
||||
if (!(cert_obj = TS_CONF_load_cert(cert)))
|
||||
goto err;
|
||||
if (!TS_RESP_CTX_set_signer_cert(ctx, cert_obj))
|
||||
goto err;
|
||||
|
||||
ret = 1;
|
||||
ret = 1;
|
||||
err:
|
||||
X509_free(cert_obj);
|
||||
return ret;
|
||||
}
|
||||
X509_free(cert_obj);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,
|
||||
TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
STACK_OF(X509) *certs_obj = NULL;
|
||||
if (!certs)
|
||||
certs = NCONF_get_string(conf, section, ENV_CERTS);
|
||||
/* Certificate chain is optional. */
|
||||
if (!certs) goto end;
|
||||
if (!(certs_obj = TS_CONF_load_certs(certs))) goto err;
|
||||
if (!TS_RESP_CTX_set_certs(ctx, certs_obj)) goto err;
|
||||
TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
STACK_OF(X509) *certs_obj = NULL;
|
||||
if (!certs)
|
||||
certs = NCONF_get_string(conf, section, ENV_CERTS);
|
||||
/* Certificate chain is optional. */
|
||||
if (!certs)
|
||||
goto end;
|
||||
if (!(certs_obj = TS_CONF_load_certs(certs)))
|
||||
goto err;
|
||||
if (!TS_RESP_CTX_set_certs(ctx, certs_obj))
|
||||
goto err;
|
||||
end:
|
||||
ret = 1;
|
||||
ret = 1;
|
||||
err:
|
||||
sk_X509_pop_free(certs_obj, X509_free);
|
||||
return ret;
|
||||
}
|
||||
sk_X509_pop_free(certs_obj, X509_free);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int TS_CONF_set_signer_key(CONF *conf, const char *section,
|
||||
const char *key, const char *pass,
|
||||
TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
EVP_PKEY *key_obj = NULL;
|
||||
if (!key)
|
||||
key = NCONF_get_string(conf, section, ENV_SIGNER_KEY);
|
||||
if (!key)
|
||||
{
|
||||
TS_CONF_lookup_fail(section, ENV_SIGNER_KEY);
|
||||
goto err;
|
||||
}
|
||||
if (!(key_obj = TS_CONF_load_key(key, pass))) goto err;
|
||||
if (!TS_RESP_CTX_set_signer_key(ctx, key_obj)) goto err;
|
||||
const char *key, const char *pass,
|
||||
TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
EVP_PKEY *key_obj = NULL;
|
||||
if (!key)
|
||||
key = NCONF_get_string(conf, section, ENV_SIGNER_KEY);
|
||||
if (!key) {
|
||||
TS_CONF_lookup_fail(section, ENV_SIGNER_KEY);
|
||||
goto err;
|
||||
}
|
||||
if (!(key_obj = TS_CONF_load_key(key, pass)))
|
||||
goto err;
|
||||
if (!TS_RESP_CTX_set_signer_key(ctx, key_obj))
|
||||
goto err;
|
||||
|
||||
ret = 1;
|
||||
ret = 1;
|
||||
err:
|
||||
EVP_PKEY_free(key_obj);
|
||||
return ret;
|
||||
}
|
||||
EVP_PKEY_free(key_obj);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int TS_CONF_set_def_policy(CONF *conf, const char *section,
|
||||
const char *policy, TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
ASN1_OBJECT *policy_obj = NULL;
|
||||
if (!policy)
|
||||
policy = NCONF_get_string(conf, section,
|
||||
ENV_DEFAULT_POLICY);
|
||||
if (!policy)
|
||||
{
|
||||
TS_CONF_lookup_fail(section, ENV_DEFAULT_POLICY);
|
||||
goto err;
|
||||
}
|
||||
if (!(policy_obj = OBJ_txt2obj(policy, 0)))
|
||||
{
|
||||
TS_CONF_invalid(section, ENV_DEFAULT_POLICY);
|
||||
goto err;
|
||||
}
|
||||
if (!TS_RESP_CTX_set_def_policy(ctx, policy_obj))
|
||||
goto err;
|
||||
const char *policy, TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
ASN1_OBJECT *policy_obj = NULL;
|
||||
if (!policy)
|
||||
policy = NCONF_get_string(conf, section, ENV_DEFAULT_POLICY);
|
||||
if (!policy) {
|
||||
TS_CONF_lookup_fail(section, ENV_DEFAULT_POLICY);
|
||||
goto err;
|
||||
}
|
||||
if (!(policy_obj = OBJ_txt2obj(policy, 0))) {
|
||||
TS_CONF_invalid(section, ENV_DEFAULT_POLICY);
|
||||
goto err;
|
||||
}
|
||||
if (!TS_RESP_CTX_set_def_policy(ctx, policy_obj))
|
||||
goto err;
|
||||
|
||||
ret = 1;
|
||||
ret = 1;
|
||||
err:
|
||||
ASN1_OBJECT_free(policy_obj);
|
||||
return ret;
|
||||
}
|
||||
ASN1_OBJECT_free(policy_obj);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int TS_CONF_set_policies(CONF *conf, const char *section,
|
||||
TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
int i;
|
||||
STACK_OF(CONF_VALUE) *list = NULL;
|
||||
char *policies = NCONF_get_string(conf, section,
|
||||
ENV_OTHER_POLICIES);
|
||||
/* If no other policy is specified, that's fine. */
|
||||
if (policies && !(list = X509V3_parse_list(policies)))
|
||||
{
|
||||
TS_CONF_invalid(section, ENV_OTHER_POLICIES);
|
||||
goto err;
|
||||
}
|
||||
for (i = 0; i < sk_CONF_VALUE_num(list); ++i)
|
||||
{
|
||||
CONF_VALUE *val = sk_CONF_VALUE_value(list, i);
|
||||
const char *extval = val->value ? val->value : val->name;
|
||||
ASN1_OBJECT *objtmp;
|
||||
if (!(objtmp = OBJ_txt2obj(extval, 0)))
|
||||
{
|
||||
TS_CONF_invalid(section, ENV_OTHER_POLICIES);
|
||||
goto err;
|
||||
}
|
||||
if (!TS_RESP_CTX_add_policy(ctx, objtmp))
|
||||
goto err;
|
||||
ASN1_OBJECT_free(objtmp);
|
||||
}
|
||||
int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
int i;
|
||||
STACK_OF(CONF_VALUE) *list = NULL;
|
||||
char *policies = NCONF_get_string(conf, section,
|
||||
ENV_OTHER_POLICIES);
|
||||
/* If no other policy is specified, that's fine. */
|
||||
if (policies && !(list = X509V3_parse_list(policies))) {
|
||||
TS_CONF_invalid(section, ENV_OTHER_POLICIES);
|
||||
goto err;
|
||||
}
|
||||
for (i = 0; i < sk_CONF_VALUE_num(list); ++i) {
|
||||
CONF_VALUE *val = sk_CONF_VALUE_value(list, i);
|
||||
const char *extval = val->value ? val->value : val->name;
|
||||
ASN1_OBJECT *objtmp;
|
||||
if (!(objtmp = OBJ_txt2obj(extval, 0))) {
|
||||
TS_CONF_invalid(section, ENV_OTHER_POLICIES);
|
||||
goto err;
|
||||
}
|
||||
if (!TS_RESP_CTX_add_policy(ctx, objtmp))
|
||||
goto err;
|
||||
ASN1_OBJECT_free(objtmp);
|
||||
}
|
||||
|
||||
ret = 1;
|
||||
ret = 1;
|
||||
err:
|
||||
sk_CONF_VALUE_pop_free(list, X509V3_conf_free);
|
||||
return ret;
|
||||
}
|
||||
sk_CONF_VALUE_pop_free(list, X509V3_conf_free);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int TS_CONF_set_digests(CONF *conf, const char *section,
|
||||
TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
int i;
|
||||
STACK_OF(CONF_VALUE) *list = NULL;
|
||||
char *digests = NCONF_get_string(conf, section, ENV_DIGESTS);
|
||||
if (!digests)
|
||||
{
|
||||
TS_CONF_lookup_fail(section, ENV_DIGESTS);
|
||||
goto err;
|
||||
}
|
||||
if (!(list = X509V3_parse_list(digests)))
|
||||
{
|
||||
TS_CONF_invalid(section, ENV_DIGESTS);
|
||||
goto err;
|
||||
}
|
||||
if (sk_CONF_VALUE_num(list) == 0)
|
||||
{
|
||||
TS_CONF_invalid(section, ENV_DIGESTS);
|
||||
goto err;
|
||||
}
|
||||
for (i = 0; i < sk_CONF_VALUE_num(list); ++i)
|
||||
{
|
||||
CONF_VALUE *val = sk_CONF_VALUE_value(list, i);
|
||||
const char *extval = val->value ? val->value : val->name;
|
||||
const EVP_MD *md;
|
||||
if (!(md = EVP_get_digestbyname(extval)))
|
||||
{
|
||||
TS_CONF_invalid(section, ENV_DIGESTS);
|
||||
goto err;
|
||||
}
|
||||
if (!TS_RESP_CTX_add_md(ctx, md))
|
||||
goto err;
|
||||
}
|
||||
int TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
int i;
|
||||
STACK_OF(CONF_VALUE) *list = NULL;
|
||||
char *digests = NCONF_get_string(conf, section, ENV_DIGESTS);
|
||||
if (!digests) {
|
||||
TS_CONF_lookup_fail(section, ENV_DIGESTS);
|
||||
goto err;
|
||||
}
|
||||
if (!(list = X509V3_parse_list(digests))) {
|
||||
TS_CONF_invalid(section, ENV_DIGESTS);
|
||||
goto err;
|
||||
}
|
||||
if (sk_CONF_VALUE_num(list) == 0) {
|
||||
TS_CONF_invalid(section, ENV_DIGESTS);
|
||||
goto err;
|
||||
}
|
||||
for (i = 0; i < sk_CONF_VALUE_num(list); ++i) {
|
||||
CONF_VALUE *val = sk_CONF_VALUE_value(list, i);
|
||||
const char *extval = val->value ? val->value : val->name;
|
||||
const EVP_MD *md;
|
||||
if (!(md = EVP_get_digestbyname(extval))) {
|
||||
TS_CONF_invalid(section, ENV_DIGESTS);
|
||||
goto err;
|
||||
}
|
||||
if (!TS_RESP_CTX_add_md(ctx, md))
|
||||
goto err;
|
||||
}
|
||||
|
||||
ret = 1;
|
||||
ret = 1;
|
||||
err:
|
||||
sk_CONF_VALUE_pop_free(list, X509V3_conf_free);
|
||||
return ret;
|
||||
}
|
||||
sk_CONF_VALUE_pop_free(list, X509V3_conf_free);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
int i;
|
||||
int secs = 0, millis = 0, micros = 0;
|
||||
STACK_OF(CONF_VALUE) *list = NULL;
|
||||
char *accuracy = NCONF_get_string(conf, section, ENV_ACCURACY);
|
||||
{
|
||||
int ret = 0;
|
||||
int i;
|
||||
int secs = 0, millis = 0, micros = 0;
|
||||
STACK_OF(CONF_VALUE) *list = NULL;
|
||||
char *accuracy = NCONF_get_string(conf, section, ENV_ACCURACY);
|
||||
|
||||
if (accuracy && !(list = X509V3_parse_list(accuracy)))
|
||||
{
|
||||
TS_CONF_invalid(section, ENV_ACCURACY);
|
||||
goto err;
|
||||
}
|
||||
for (i = 0; i < sk_CONF_VALUE_num(list); ++i)
|
||||
{
|
||||
CONF_VALUE *val = sk_CONF_VALUE_value(list, i);
|
||||
if (strcmp(val->name, ENV_VALUE_SECS) == 0)
|
||||
{
|
||||
if (val->value) secs = atoi(val->value);
|
||||
}
|
||||
else if (strcmp(val->name, ENV_VALUE_MILLISECS) == 0)
|
||||
{
|
||||
if (val->value) millis = atoi(val->value);
|
||||
}
|
||||
else if (strcmp(val->name, ENV_VALUE_MICROSECS) == 0)
|
||||
{
|
||||
if (val->value) micros = atoi(val->value);
|
||||
}
|
||||
else
|
||||
{
|
||||
TS_CONF_invalid(section, ENV_ACCURACY);
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
if (!TS_RESP_CTX_set_accuracy(ctx, secs, millis, micros))
|
||||
goto err;
|
||||
if (accuracy && !(list = X509V3_parse_list(accuracy))) {
|
||||
TS_CONF_invalid(section, ENV_ACCURACY);
|
||||
goto err;
|
||||
}
|
||||
for (i = 0; i < sk_CONF_VALUE_num(list); ++i) {
|
||||
CONF_VALUE *val = sk_CONF_VALUE_value(list, i);
|
||||
if (strcmp(val->name, ENV_VALUE_SECS) == 0) {
|
||||
if (val->value)
|
||||
secs = atoi(val->value);
|
||||
} else if (strcmp(val->name, ENV_VALUE_MILLISECS) == 0) {
|
||||
if (val->value)
|
||||
millis = atoi(val->value);
|
||||
} else if (strcmp(val->name, ENV_VALUE_MICROSECS) == 0) {
|
||||
if (val->value)
|
||||
micros = atoi(val->value);
|
||||
} else {
|
||||
TS_CONF_invalid(section, ENV_ACCURACY);
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
if (!TS_RESP_CTX_set_accuracy(ctx, secs, millis, micros))
|
||||
goto err;
|
||||
|
||||
ret = 1;
|
||||
ret = 1;
|
||||
err:
|
||||
sk_CONF_VALUE_pop_free(list, X509V3_conf_free);
|
||||
return ret;
|
||||
}
|
||||
sk_CONF_VALUE_pop_free(list, X509V3_conf_free);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int TS_CONF_set_clock_precision_digits(CONF *conf, const char *section,
|
||||
TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
long digits = 0;
|
||||
|
||||
/* If not specified, set the default value to 0, i.e. sec precision */
|
||||
if (!NCONF_get_number_e(conf, section, ENV_CLOCK_PRECISION_DIGITS,
|
||||
&digits))
|
||||
digits = 0;
|
||||
if (digits < 0 || digits > TS_MAX_CLOCK_PRECISION_DIGITS)
|
||||
{
|
||||
TS_CONF_invalid(section, ENV_CLOCK_PRECISION_DIGITS);
|
||||
goto err;
|
||||
}
|
||||
TS_RESP_CTX *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
long digits = 0;
|
||||
|
||||
if (!TS_RESP_CTX_set_clock_precision_digits(ctx, digits))
|
||||
goto err;
|
||||
/*
|
||||
* If not specified, set the default value to 0, i.e. sec precision
|
||||
*/
|
||||
if (!NCONF_get_number_e(conf, section, ENV_CLOCK_PRECISION_DIGITS,
|
||||
&digits))
|
||||
digits = 0;
|
||||
if (digits < 0 || digits > TS_MAX_CLOCK_PRECISION_DIGITS) {
|
||||
TS_CONF_invalid(section, ENV_CLOCK_PRECISION_DIGITS);
|
||||
goto err;
|
||||
}
|
||||
|
||||
return 1;
|
||||
if (!TS_RESP_CTX_set_clock_precision_digits(ctx, digits))
|
||||
goto err;
|
||||
|
||||
return 1;
|
||||
err:
|
||||
return ret;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int TS_CONF_add_flag(CONF *conf, const char *section, const char *field,
|
||||
int flag, TS_RESP_CTX *ctx)
|
||||
{
|
||||
/* Default is false. */
|
||||
const char *value = NCONF_get_string(conf, section, field);
|
||||
if (value)
|
||||
{
|
||||
if (strcmp(value, ENV_VALUE_YES) == 0)
|
||||
TS_RESP_CTX_add_flags(ctx, flag);
|
||||
else if (strcmp(value, ENV_VALUE_NO) != 0)
|
||||
{
|
||||
TS_CONF_invalid(section, field);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
static int TS_CONF_add_flag(CONF *conf, const char *section,
|
||||
const char *field, int flag, TS_RESP_CTX *ctx)
|
||||
{
|
||||
/* Default is false. */
|
||||
const char *value = NCONF_get_string(conf, section, field);
|
||||
if (value) {
|
||||
if (strcmp(value, ENV_VALUE_YES) == 0)
|
||||
TS_RESP_CTX_add_flags(ctx, flag);
|
||||
else if (strcmp(value, ENV_VALUE_NO) != 0) {
|
||||
TS_CONF_invalid(section, field);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int TS_CONF_set_ordering(CONF *conf, const char *section, TS_RESP_CTX *ctx)
|
||||
{
|
||||
return TS_CONF_add_flag(conf, section, ENV_ORDERING, TS_ORDERING, ctx);
|
||||
}
|
||||
{
|
||||
return TS_CONF_add_flag(conf, section, ENV_ORDERING, TS_ORDERING, ctx);
|
||||
}
|
||||
|
||||
int TS_CONF_set_tsa_name(CONF *conf, const char *section, TS_RESP_CTX *ctx)
|
||||
{
|
||||
return TS_CONF_add_flag(conf, section, ENV_TSA_NAME, TS_TSA_NAME, ctx);
|
||||
}
|
||||
{
|
||||
return TS_CONF_add_flag(conf, section, ENV_TSA_NAME, TS_TSA_NAME, ctx);
|
||||
}
|
||||
|
||||
int TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section,
|
||||
TS_RESP_CTX *ctx)
|
||||
{
|
||||
return TS_CONF_add_flag(conf, section, ENV_ESS_CERT_ID_CHAIN,
|
||||
TS_ESS_CERT_ID_CHAIN, ctx);
|
||||
}
|
||||
TS_RESP_CTX *ctx)
|
||||
{
|
||||
return TS_CONF_add_flag(conf, section, ENV_ESS_CERT_ID_CHAIN,
|
||||
TS_ESS_CERT_ID_CHAIN, ctx);
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -7,7 +7,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -53,7 +53,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/* NOTE: this file was auto generated by the mkerr.pl script: any changes
|
||||
/*
|
||||
* NOTE: this file was auto generated by the mkerr.pl script: any changes
|
||||
* made to it will be overwritten when the script next updates this file,
|
||||
* only reason strings will be preserved.
|
||||
*/
|
||||
@@ -65,115 +66,123 @@
|
||||
/* BEGIN ERROR CODES */
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
||||
#define ERR_FUNC(func) ERR_PACK(ERR_LIB_TS,func,0)
|
||||
#define ERR_REASON(reason) ERR_PACK(ERR_LIB_TS,0,reason)
|
||||
# define ERR_FUNC(func) ERR_PACK(ERR_LIB_TS,func,0)
|
||||
# define ERR_REASON(reason) ERR_PACK(ERR_LIB_TS,0,reason)
|
||||
|
||||
static ERR_STRING_DATA TS_str_functs[]=
|
||||
{
|
||||
{ERR_FUNC(TS_F_D2I_TS_RESP), "d2i_TS_RESP"},
|
||||
{ERR_FUNC(TS_F_DEF_SERIAL_CB), "DEF_SERIAL_CB"},
|
||||
{ERR_FUNC(TS_F_DEF_TIME_CB), "DEF_TIME_CB"},
|
||||
{ERR_FUNC(TS_F_ESS_ADD_SIGNING_CERT), "ESS_ADD_SIGNING_CERT"},
|
||||
{ERR_FUNC(TS_F_ESS_CERT_ID_NEW_INIT), "ESS_CERT_ID_NEW_INIT"},
|
||||
{ERR_FUNC(TS_F_ESS_SIGNING_CERT_NEW_INIT), "ESS_SIGNING_CERT_NEW_INIT"},
|
||||
{ERR_FUNC(TS_F_INT_TS_RESP_VERIFY_TOKEN), "INT_TS_RESP_VERIFY_TOKEN"},
|
||||
{ERR_FUNC(TS_F_PKCS7_TO_TS_TST_INFO), "PKCS7_to_TS_TST_INFO"},
|
||||
{ERR_FUNC(TS_F_TS_ACCURACY_SET_MICROS), "TS_ACCURACY_set_micros"},
|
||||
{ERR_FUNC(TS_F_TS_ACCURACY_SET_MILLIS), "TS_ACCURACY_set_millis"},
|
||||
{ERR_FUNC(TS_F_TS_ACCURACY_SET_SECONDS), "TS_ACCURACY_set_seconds"},
|
||||
{ERR_FUNC(TS_F_TS_CHECK_IMPRINTS), "TS_CHECK_IMPRINTS"},
|
||||
{ERR_FUNC(TS_F_TS_CHECK_NONCES), "TS_CHECK_NONCES"},
|
||||
{ERR_FUNC(TS_F_TS_CHECK_POLICY), "TS_CHECK_POLICY"},
|
||||
{ERR_FUNC(TS_F_TS_CHECK_SIGNING_CERTS), "TS_CHECK_SIGNING_CERTS"},
|
||||
{ERR_FUNC(TS_F_TS_CHECK_STATUS_INFO), "TS_CHECK_STATUS_INFO"},
|
||||
{ERR_FUNC(TS_F_TS_COMPUTE_IMPRINT), "TS_COMPUTE_IMPRINT"},
|
||||
{ERR_FUNC(TS_F_TS_CONF_SET_DEFAULT_ENGINE), "TS_CONF_set_default_engine"},
|
||||
{ERR_FUNC(TS_F_TS_GET_STATUS_TEXT), "TS_GET_STATUS_TEXT"},
|
||||
{ERR_FUNC(TS_F_TS_MSG_IMPRINT_SET_ALGO), "TS_MSG_IMPRINT_set_algo"},
|
||||
{ERR_FUNC(TS_F_TS_REQ_SET_MSG_IMPRINT), "TS_REQ_set_msg_imprint"},
|
||||
{ERR_FUNC(TS_F_TS_REQ_SET_NONCE), "TS_REQ_set_nonce"},
|
||||
{ERR_FUNC(TS_F_TS_REQ_SET_POLICY_ID), "TS_REQ_set_policy_id"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CREATE_RESPONSE), "TS_RESP_create_response"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CREATE_TST_INFO), "TS_RESP_CREATE_TST_INFO"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_ADD_FAILURE_INFO), "TS_RESP_CTX_add_failure_info"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_ADD_MD), "TS_RESP_CTX_add_md"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_ADD_POLICY), "TS_RESP_CTX_add_policy"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_NEW), "TS_RESP_CTX_new"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_SET_ACCURACY), "TS_RESP_CTX_set_accuracy"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_SET_CERTS), "TS_RESP_CTX_set_certs"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_SET_DEF_POLICY), "TS_RESP_CTX_set_def_policy"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_SET_SIGNER_CERT), "TS_RESP_CTX_set_signer_cert"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_SET_STATUS_INFO), "TS_RESP_CTX_set_status_info"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_GET_POLICY), "TS_RESP_GET_POLICY"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_SET_GENTIME_WITH_PRECISION), "TS_RESP_SET_GENTIME_WITH_PRECISION"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_SET_STATUS_INFO), "TS_RESP_set_status_info"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_SET_TST_INFO), "TS_RESP_set_tst_info"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_SIGN), "TS_RESP_SIGN"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_VERIFY_SIGNATURE), "TS_RESP_verify_signature"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_VERIFY_TOKEN), "TS_RESP_verify_token"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_ACCURACY), "TS_TST_INFO_set_accuracy"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_MSG_IMPRINT), "TS_TST_INFO_set_msg_imprint"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_NONCE), "TS_TST_INFO_set_nonce"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_POLICY_ID), "TS_TST_INFO_set_policy_id"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_SERIAL), "TS_TST_INFO_set_serial"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_TIME), "TS_TST_INFO_set_time"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_TSA), "TS_TST_INFO_set_tsa"},
|
||||
{ERR_FUNC(TS_F_TS_VERIFY), "TS_VERIFY"},
|
||||
{ERR_FUNC(TS_F_TS_VERIFY_CERT), "TS_VERIFY_CERT"},
|
||||
{ERR_FUNC(TS_F_TS_VERIFY_CTX_NEW), "TS_VERIFY_CTX_new"},
|
||||
{0,NULL}
|
||||
};
|
||||
static ERR_STRING_DATA TS_str_functs[] = {
|
||||
{ERR_FUNC(TS_F_D2I_TS_RESP), "d2i_TS_RESP"},
|
||||
{ERR_FUNC(TS_F_DEF_SERIAL_CB), "DEF_SERIAL_CB"},
|
||||
{ERR_FUNC(TS_F_DEF_TIME_CB), "DEF_TIME_CB"},
|
||||
{ERR_FUNC(TS_F_ESS_ADD_SIGNING_CERT), "ESS_ADD_SIGNING_CERT"},
|
||||
{ERR_FUNC(TS_F_ESS_CERT_ID_NEW_INIT), "ESS_CERT_ID_NEW_INIT"},
|
||||
{ERR_FUNC(TS_F_ESS_SIGNING_CERT_NEW_INIT), "ESS_SIGNING_CERT_NEW_INIT"},
|
||||
{ERR_FUNC(TS_F_INT_TS_RESP_VERIFY_TOKEN), "INT_TS_RESP_VERIFY_TOKEN"},
|
||||
{ERR_FUNC(TS_F_PKCS7_TO_TS_TST_INFO), "PKCS7_to_TS_TST_INFO"},
|
||||
{ERR_FUNC(TS_F_TS_ACCURACY_SET_MICROS), "TS_ACCURACY_set_micros"},
|
||||
{ERR_FUNC(TS_F_TS_ACCURACY_SET_MILLIS), "TS_ACCURACY_set_millis"},
|
||||
{ERR_FUNC(TS_F_TS_ACCURACY_SET_SECONDS), "TS_ACCURACY_set_seconds"},
|
||||
{ERR_FUNC(TS_F_TS_CHECK_IMPRINTS), "TS_CHECK_IMPRINTS"},
|
||||
{ERR_FUNC(TS_F_TS_CHECK_NONCES), "TS_CHECK_NONCES"},
|
||||
{ERR_FUNC(TS_F_TS_CHECK_POLICY), "TS_CHECK_POLICY"},
|
||||
{ERR_FUNC(TS_F_TS_CHECK_SIGNING_CERTS), "TS_CHECK_SIGNING_CERTS"},
|
||||
{ERR_FUNC(TS_F_TS_CHECK_STATUS_INFO), "TS_CHECK_STATUS_INFO"},
|
||||
{ERR_FUNC(TS_F_TS_COMPUTE_IMPRINT), "TS_COMPUTE_IMPRINT"},
|
||||
{ERR_FUNC(TS_F_TS_CONF_SET_DEFAULT_ENGINE), "TS_CONF_set_default_engine"},
|
||||
{ERR_FUNC(TS_F_TS_GET_STATUS_TEXT), "TS_GET_STATUS_TEXT"},
|
||||
{ERR_FUNC(TS_F_TS_MSG_IMPRINT_SET_ALGO), "TS_MSG_IMPRINT_set_algo"},
|
||||
{ERR_FUNC(TS_F_TS_REQ_SET_MSG_IMPRINT), "TS_REQ_set_msg_imprint"},
|
||||
{ERR_FUNC(TS_F_TS_REQ_SET_NONCE), "TS_REQ_set_nonce"},
|
||||
{ERR_FUNC(TS_F_TS_REQ_SET_POLICY_ID), "TS_REQ_set_policy_id"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CREATE_RESPONSE), "TS_RESP_create_response"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CREATE_TST_INFO), "TS_RESP_CREATE_TST_INFO"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_ADD_FAILURE_INFO),
|
||||
"TS_RESP_CTX_add_failure_info"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_ADD_MD), "TS_RESP_CTX_add_md"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_ADD_POLICY), "TS_RESP_CTX_add_policy"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_NEW), "TS_RESP_CTX_new"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_SET_ACCURACY), "TS_RESP_CTX_set_accuracy"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_SET_CERTS), "TS_RESP_CTX_set_certs"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_SET_DEF_POLICY), "TS_RESP_CTX_set_def_policy"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_SET_SIGNER_CERT),
|
||||
"TS_RESP_CTX_set_signer_cert"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_CTX_SET_STATUS_INFO),
|
||||
"TS_RESP_CTX_set_status_info"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_GET_POLICY), "TS_RESP_GET_POLICY"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_SET_GENTIME_WITH_PRECISION),
|
||||
"TS_RESP_SET_GENTIME_WITH_PRECISION"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_SET_STATUS_INFO), "TS_RESP_set_status_info"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_SET_TST_INFO), "TS_RESP_set_tst_info"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_SIGN), "TS_RESP_SIGN"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_VERIFY_SIGNATURE), "TS_RESP_verify_signature"},
|
||||
{ERR_FUNC(TS_F_TS_RESP_VERIFY_TOKEN), "TS_RESP_verify_token"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_ACCURACY), "TS_TST_INFO_set_accuracy"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_MSG_IMPRINT),
|
||||
"TS_TST_INFO_set_msg_imprint"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_NONCE), "TS_TST_INFO_set_nonce"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_POLICY_ID), "TS_TST_INFO_set_policy_id"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_SERIAL), "TS_TST_INFO_set_serial"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_TIME), "TS_TST_INFO_set_time"},
|
||||
{ERR_FUNC(TS_F_TS_TST_INFO_SET_TSA), "TS_TST_INFO_set_tsa"},
|
||||
{ERR_FUNC(TS_F_TS_VERIFY), "TS_VERIFY"},
|
||||
{ERR_FUNC(TS_F_TS_VERIFY_CERT), "TS_VERIFY_CERT"},
|
||||
{ERR_FUNC(TS_F_TS_VERIFY_CTX_NEW), "TS_VERIFY_CTX_new"},
|
||||
{0, NULL}
|
||||
};
|
||||
|
||||
static ERR_STRING_DATA TS_str_reasons[]=
|
||||
{
|
||||
{ERR_REASON(TS_R_BAD_PKCS7_TYPE) ,"bad pkcs7 type"},
|
||||
{ERR_REASON(TS_R_BAD_TYPE) ,"bad type"},
|
||||
{ERR_REASON(TS_R_CERTIFICATE_VERIFY_ERROR),"certificate verify error"},
|
||||
{ERR_REASON(TS_R_COULD_NOT_SET_ENGINE) ,"could not set engine"},
|
||||
{ERR_REASON(TS_R_COULD_NOT_SET_TIME) ,"could not set time"},
|
||||
{ERR_REASON(TS_R_D2I_TS_RESP_INT_FAILED) ,"d2i ts resp int failed"},
|
||||
{ERR_REASON(TS_R_DETACHED_CONTENT) ,"detached content"},
|
||||
{ERR_REASON(TS_R_ESS_ADD_SIGNING_CERT_ERROR),"ess add signing cert error"},
|
||||
{ERR_REASON(TS_R_ESS_SIGNING_CERTIFICATE_ERROR),"ess signing certificate error"},
|
||||
{ERR_REASON(TS_R_INVALID_NULL_POINTER) ,"invalid null pointer"},
|
||||
{ERR_REASON(TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE),"invalid signer certificate purpose"},
|
||||
{ERR_REASON(TS_R_MESSAGE_IMPRINT_MISMATCH),"message imprint mismatch"},
|
||||
{ERR_REASON(TS_R_NONCE_MISMATCH) ,"nonce mismatch"},
|
||||
{ERR_REASON(TS_R_NONCE_NOT_RETURNED) ,"nonce not returned"},
|
||||
{ERR_REASON(TS_R_NO_CONTENT) ,"no content"},
|
||||
{ERR_REASON(TS_R_NO_TIME_STAMP_TOKEN) ,"no time stamp token"},
|
||||
{ERR_REASON(TS_R_PKCS7_ADD_SIGNATURE_ERROR),"pkcs7 add signature error"},
|
||||
{ERR_REASON(TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR),"pkcs7 add signed attr error"},
|
||||
{ERR_REASON(TS_R_PKCS7_TO_TS_TST_INFO_FAILED),"pkcs7 to ts tst info failed"},
|
||||
{ERR_REASON(TS_R_POLICY_MISMATCH) ,"policy mismatch"},
|
||||
{ERR_REASON(TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),"private key does not match certificate"},
|
||||
{ERR_REASON(TS_R_RESPONSE_SETUP_ERROR) ,"response setup error"},
|
||||
{ERR_REASON(TS_R_SIGNATURE_FAILURE) ,"signature failure"},
|
||||
{ERR_REASON(TS_R_THERE_MUST_BE_ONE_SIGNER),"there must be one signer"},
|
||||
{ERR_REASON(TS_R_TIME_SYSCALL_ERROR) ,"time syscall error"},
|
||||
{ERR_REASON(TS_R_TOKEN_NOT_PRESENT) ,"token not present"},
|
||||
{ERR_REASON(TS_R_TOKEN_PRESENT) ,"token present"},
|
||||
{ERR_REASON(TS_R_TSA_NAME_MISMATCH) ,"tsa name mismatch"},
|
||||
{ERR_REASON(TS_R_TSA_UNTRUSTED) ,"tsa untrusted"},
|
||||
{ERR_REASON(TS_R_TST_INFO_SETUP_ERROR) ,"tst info setup error"},
|
||||
{ERR_REASON(TS_R_TS_DATASIGN) ,"ts datasign"},
|
||||
{ERR_REASON(TS_R_UNACCEPTABLE_POLICY) ,"unacceptable policy"},
|
||||
{ERR_REASON(TS_R_UNSUPPORTED_MD_ALGORITHM),"unsupported md algorithm"},
|
||||
{ERR_REASON(TS_R_UNSUPPORTED_VERSION) ,"unsupported version"},
|
||||
{ERR_REASON(TS_R_WRONG_CONTENT_TYPE) ,"wrong content type"},
|
||||
{0,NULL}
|
||||
};
|
||||
static ERR_STRING_DATA TS_str_reasons[] = {
|
||||
{ERR_REASON(TS_R_BAD_PKCS7_TYPE), "bad pkcs7 type"},
|
||||
{ERR_REASON(TS_R_BAD_TYPE), "bad type"},
|
||||
{ERR_REASON(TS_R_CERTIFICATE_VERIFY_ERROR), "certificate verify error"},
|
||||
{ERR_REASON(TS_R_COULD_NOT_SET_ENGINE), "could not set engine"},
|
||||
{ERR_REASON(TS_R_COULD_NOT_SET_TIME), "could not set time"},
|
||||
{ERR_REASON(TS_R_D2I_TS_RESP_INT_FAILED), "d2i ts resp int failed"},
|
||||
{ERR_REASON(TS_R_DETACHED_CONTENT), "detached content"},
|
||||
{ERR_REASON(TS_R_ESS_ADD_SIGNING_CERT_ERROR),
|
||||
"ess add signing cert error"},
|
||||
{ERR_REASON(TS_R_ESS_SIGNING_CERTIFICATE_ERROR),
|
||||
"ess signing certificate error"},
|
||||
{ERR_REASON(TS_R_INVALID_NULL_POINTER), "invalid null pointer"},
|
||||
{ERR_REASON(TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE),
|
||||
"invalid signer certificate purpose"},
|
||||
{ERR_REASON(TS_R_MESSAGE_IMPRINT_MISMATCH), "message imprint mismatch"},
|
||||
{ERR_REASON(TS_R_NONCE_MISMATCH), "nonce mismatch"},
|
||||
{ERR_REASON(TS_R_NONCE_NOT_RETURNED), "nonce not returned"},
|
||||
{ERR_REASON(TS_R_NO_CONTENT), "no content"},
|
||||
{ERR_REASON(TS_R_NO_TIME_STAMP_TOKEN), "no time stamp token"},
|
||||
{ERR_REASON(TS_R_PKCS7_ADD_SIGNATURE_ERROR), "pkcs7 add signature error"},
|
||||
{ERR_REASON(TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR),
|
||||
"pkcs7 add signed attr error"},
|
||||
{ERR_REASON(TS_R_PKCS7_TO_TS_TST_INFO_FAILED),
|
||||
"pkcs7 to ts tst info failed"},
|
||||
{ERR_REASON(TS_R_POLICY_MISMATCH), "policy mismatch"},
|
||||
{ERR_REASON(TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
|
||||
"private key does not match certificate"},
|
||||
{ERR_REASON(TS_R_RESPONSE_SETUP_ERROR), "response setup error"},
|
||||
{ERR_REASON(TS_R_SIGNATURE_FAILURE), "signature failure"},
|
||||
{ERR_REASON(TS_R_THERE_MUST_BE_ONE_SIGNER), "there must be one signer"},
|
||||
{ERR_REASON(TS_R_TIME_SYSCALL_ERROR), "time syscall error"},
|
||||
{ERR_REASON(TS_R_TOKEN_NOT_PRESENT), "token not present"},
|
||||
{ERR_REASON(TS_R_TOKEN_PRESENT), "token present"},
|
||||
{ERR_REASON(TS_R_TSA_NAME_MISMATCH), "tsa name mismatch"},
|
||||
{ERR_REASON(TS_R_TSA_UNTRUSTED), "tsa untrusted"},
|
||||
{ERR_REASON(TS_R_TST_INFO_SETUP_ERROR), "tst info setup error"},
|
||||
{ERR_REASON(TS_R_TS_DATASIGN), "ts datasign"},
|
||||
{ERR_REASON(TS_R_UNACCEPTABLE_POLICY), "unacceptable policy"},
|
||||
{ERR_REASON(TS_R_UNSUPPORTED_MD_ALGORITHM), "unsupported md algorithm"},
|
||||
{ERR_REASON(TS_R_UNSUPPORTED_VERSION), "unsupported version"},
|
||||
{ERR_REASON(TS_R_WRONG_CONTENT_TYPE), "wrong content type"},
|
||||
{0, NULL}
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
void ERR_load_TS_strings(void)
|
||||
{
|
||||
{
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
||||
if (ERR_func_error_string(TS_str_functs[0].error) == NULL)
|
||||
{
|
||||
ERR_load_strings(0,TS_str_functs);
|
||||
ERR_load_strings(0,TS_str_reasons);
|
||||
}
|
||||
if (ERR_func_error_string(TS_str_functs[0].error) == NULL) {
|
||||
ERR_load_strings(0, TS_str_functs);
|
||||
ERR_load_strings(0, TS_str_reasons);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -1,6 +1,7 @@
|
||||
/* crypto/ts/ts_lib.c */
|
||||
/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
|
||||
* project 2002.
|
||||
/*
|
||||
* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL project
|
||||
* 2002.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
|
||||
@@ -10,7 +11,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -68,78 +69,75 @@
|
||||
/* Function definitions. */
|
||||
|
||||
int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num)
|
||||
{
|
||||
BIGNUM num_bn;
|
||||
int result = 0;
|
||||
char *hex;
|
||||
{
|
||||
BIGNUM num_bn;
|
||||
int result = 0;
|
||||
char *hex;
|
||||
|
||||
BN_init(&num_bn);
|
||||
ASN1_INTEGER_to_BN(num, &num_bn);
|
||||
if ((hex = BN_bn2hex(&num_bn)))
|
||||
{
|
||||
result = BIO_write(bio, "0x", 2) > 0;
|
||||
result = result && BIO_write(bio, hex, strlen(hex)) > 0;
|
||||
OPENSSL_free(hex);
|
||||
}
|
||||
BN_free(&num_bn);
|
||||
BN_init(&num_bn);
|
||||
ASN1_INTEGER_to_BN(num, &num_bn);
|
||||
if ((hex = BN_bn2hex(&num_bn))) {
|
||||
result = BIO_write(bio, "0x", 2) > 0;
|
||||
result = result && BIO_write(bio, hex, strlen(hex)) > 0;
|
||||
OPENSSL_free(hex);
|
||||
}
|
||||
BN_free(&num_bn);
|
||||
|
||||
return result;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
int TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj)
|
||||
{
|
||||
char obj_txt[128];
|
||||
{
|
||||
char obj_txt[128];
|
||||
|
||||
int len = OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0);
|
||||
BIO_write(bio, obj_txt, len);
|
||||
BIO_write(bio, "\n", 1);
|
||||
int len = OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0);
|
||||
BIO_write(bio, obj_txt, len);
|
||||
BIO_write(bio, "\n", 1);
|
||||
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions)
|
||||
{
|
||||
int i, critical, n;
|
||||
X509_EXTENSION *ex;
|
||||
ASN1_OBJECT *obj;
|
||||
{
|
||||
int i, critical, n;
|
||||
X509_EXTENSION *ex;
|
||||
ASN1_OBJECT *obj;
|
||||
|
||||
BIO_printf(bio, "Extensions:\n");
|
||||
n = X509v3_get_ext_count(extensions);
|
||||
for (i = 0; i < n; i++)
|
||||
{
|
||||
ex = X509v3_get_ext(extensions, i);
|
||||
obj = X509_EXTENSION_get_object(ex);
|
||||
i2a_ASN1_OBJECT(bio, obj);
|
||||
critical = X509_EXTENSION_get_critical(ex);
|
||||
BIO_printf(bio, ": %s\n", critical ? "critical" : "");
|
||||
if (!X509V3_EXT_print(bio, ex, 0, 4))
|
||||
{
|
||||
BIO_printf(bio, "%4s", "");
|
||||
M_ASN1_OCTET_STRING_print(bio, ex->value);
|
||||
}
|
||||
BIO_write(bio, "\n", 1);
|
||||
}
|
||||
BIO_printf(bio, "Extensions:\n");
|
||||
n = X509v3_get_ext_count(extensions);
|
||||
for (i = 0; i < n; i++) {
|
||||
ex = X509v3_get_ext(extensions, i);
|
||||
obj = X509_EXTENSION_get_object(ex);
|
||||
i2a_ASN1_OBJECT(bio, obj);
|
||||
critical = X509_EXTENSION_get_critical(ex);
|
||||
BIO_printf(bio, ": %s\n", critical ? "critical" : "");
|
||||
if (!X509V3_EXT_print(bio, ex, 0, 4)) {
|
||||
BIO_printf(bio, "%4s", "");
|
||||
M_ASN1_OCTET_STRING_print(bio, ex->value);
|
||||
}
|
||||
BIO_write(bio, "\n", 1);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg)
|
||||
{
|
||||
int i = OBJ_obj2nid(alg->algorithm);
|
||||
return BIO_printf(bio, "Hash Algorithm: %s\n",
|
||||
(i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
|
||||
}
|
||||
{
|
||||
int i = OBJ_obj2nid(alg->algorithm);
|
||||
return BIO_printf(bio, "Hash Algorithm: %s\n",
|
||||
(i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
|
||||
}
|
||||
|
||||
int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a)
|
||||
{
|
||||
const ASN1_OCTET_STRING *msg;
|
||||
{
|
||||
const ASN1_OCTET_STRING *msg;
|
||||
|
||||
TS_X509_ALGOR_print_bio(bio, TS_MSG_IMPRINT_get_algo(a));
|
||||
TS_X509_ALGOR_print_bio(bio, TS_MSG_IMPRINT_get_algo(a));
|
||||
|
||||
BIO_printf(bio, "Message data:\n");
|
||||
msg = TS_MSG_IMPRINT_get_msg(a);
|
||||
BIO_dump_indent(bio, (const char *)M_ASN1_STRING_data(msg),
|
||||
M_ASN1_STRING_length(msg), 4);
|
||||
BIO_printf(bio, "Message data:\n");
|
||||
msg = TS_MSG_IMPRINT_get_msg(a);
|
||||
BIO_dump_indent(bio, (const char *)M_ASN1_STRING_data(msg),
|
||||
M_ASN1_STRING_length(msg), 4);
|
||||
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -1,6 +1,7 @@
|
||||
/* crypto/ts/ts_req_print.c */
|
||||
/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
|
||||
* project 2002.
|
||||
/*
|
||||
* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL project
|
||||
* 2002.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
|
||||
@@ -10,7 +11,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -66,37 +67,38 @@
|
||||
/* Function definitions. */
|
||||
|
||||
int TS_REQ_print_bio(BIO *bio, TS_REQ *a)
|
||||
{
|
||||
int v;
|
||||
ASN1_OBJECT *policy_id;
|
||||
const ASN1_INTEGER *nonce;
|
||||
{
|
||||
int v;
|
||||
ASN1_OBJECT *policy_id;
|
||||
const ASN1_INTEGER *nonce;
|
||||
|
||||
if (a == NULL) return 0;
|
||||
if (a == NULL)
|
||||
return 0;
|
||||
|
||||
v = TS_REQ_get_version(a);
|
||||
BIO_printf(bio, "Version: %d\n", v);
|
||||
v = TS_REQ_get_version(a);
|
||||
BIO_printf(bio, "Version: %d\n", v);
|
||||
|
||||
TS_MSG_IMPRINT_print_bio(bio, TS_REQ_get_msg_imprint(a));
|
||||
TS_MSG_IMPRINT_print_bio(bio, TS_REQ_get_msg_imprint(a));
|
||||
|
||||
BIO_printf(bio, "Policy OID: ");
|
||||
policy_id = TS_REQ_get_policy_id(a);
|
||||
if (policy_id == NULL)
|
||||
BIO_printf(bio, "unspecified\n");
|
||||
else
|
||||
TS_OBJ_print_bio(bio, policy_id);
|
||||
BIO_printf(bio, "Policy OID: ");
|
||||
policy_id = TS_REQ_get_policy_id(a);
|
||||
if (policy_id == NULL)
|
||||
BIO_printf(bio, "unspecified\n");
|
||||
else
|
||||
TS_OBJ_print_bio(bio, policy_id);
|
||||
|
||||
BIO_printf(bio, "Nonce: ");
|
||||
nonce = TS_REQ_get_nonce(a);
|
||||
if (nonce == NULL)
|
||||
BIO_printf(bio, "unspecified");
|
||||
else
|
||||
TS_ASN1_INTEGER_print_bio(bio, nonce);
|
||||
BIO_write(bio, "\n", 1);
|
||||
BIO_printf(bio, "Nonce: ");
|
||||
nonce = TS_REQ_get_nonce(a);
|
||||
if (nonce == NULL)
|
||||
BIO_printf(bio, "unspecified");
|
||||
else
|
||||
TS_ASN1_INTEGER_print_bio(bio, nonce);
|
||||
BIO_write(bio, "\n", 1);
|
||||
|
||||
BIO_printf(bio, "Certificate required: %s\n",
|
||||
TS_REQ_get_cert_req(a) ? "yes" : "no");
|
||||
BIO_printf(bio, "Certificate required: %s\n",
|
||||
TS_REQ_get_cert_req(a) ? "yes" : "no");
|
||||
|
||||
TS_ext_print_bio(bio, TS_REQ_get_exts(a));
|
||||
TS_ext_print_bio(bio, TS_REQ_get_exts(a));
|
||||
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -1,6 +1,7 @@
|
||||
/* crypto/ts/ts_req_utils.c */
|
||||
/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
|
||||
* project 2002.
|
||||
/*
|
||||
* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL project
|
||||
* 2002.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
|
||||
@@ -10,7 +11,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -63,172 +64,169 @@
|
||||
#include <openssl/ts.h>
|
||||
|
||||
int TS_REQ_set_version(TS_REQ *a, long version)
|
||||
{
|
||||
return ASN1_INTEGER_set(a->version, version);
|
||||
}
|
||||
{
|
||||
return ASN1_INTEGER_set(a->version, version);
|
||||
}
|
||||
|
||||
long TS_REQ_get_version(const TS_REQ *a)
|
||||
{
|
||||
return ASN1_INTEGER_get(a->version);
|
||||
}
|
||||
{
|
||||
return ASN1_INTEGER_get(a->version);
|
||||
}
|
||||
|
||||
int TS_REQ_set_msg_imprint(TS_REQ *a, TS_MSG_IMPRINT *msg_imprint)
|
||||
{
|
||||
TS_MSG_IMPRINT *new_msg_imprint;
|
||||
{
|
||||
TS_MSG_IMPRINT *new_msg_imprint;
|
||||
|
||||
if (a->msg_imprint == msg_imprint)
|
||||
return 1;
|
||||
new_msg_imprint = TS_MSG_IMPRINT_dup(msg_imprint);
|
||||
if (new_msg_imprint == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_REQ_SET_MSG_IMPRINT, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
TS_MSG_IMPRINT_free(a->msg_imprint);
|
||||
a->msg_imprint = new_msg_imprint;
|
||||
return 1;
|
||||
}
|
||||
if (a->msg_imprint == msg_imprint)
|
||||
return 1;
|
||||
new_msg_imprint = TS_MSG_IMPRINT_dup(msg_imprint);
|
||||
if (new_msg_imprint == NULL) {
|
||||
TSerr(TS_F_TS_REQ_SET_MSG_IMPRINT, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
TS_MSG_IMPRINT_free(a->msg_imprint);
|
||||
a->msg_imprint = new_msg_imprint;
|
||||
return 1;
|
||||
}
|
||||
|
||||
TS_MSG_IMPRINT *TS_REQ_get_msg_imprint(TS_REQ *a)
|
||||
{
|
||||
return a->msg_imprint;
|
||||
}
|
||||
{
|
||||
return a->msg_imprint;
|
||||
}
|
||||
|
||||
int TS_MSG_IMPRINT_set_algo(TS_MSG_IMPRINT *a, X509_ALGOR *alg)
|
||||
{
|
||||
X509_ALGOR *new_alg;
|
||||
{
|
||||
X509_ALGOR *new_alg;
|
||||
|
||||
if (a->hash_algo == alg)
|
||||
return 1;
|
||||
new_alg = X509_ALGOR_dup(alg);
|
||||
if (new_alg == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_MSG_IMPRINT_SET_ALGO, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
X509_ALGOR_free(a->hash_algo);
|
||||
a->hash_algo = new_alg;
|
||||
return 1;
|
||||
}
|
||||
if (a->hash_algo == alg)
|
||||
return 1;
|
||||
new_alg = X509_ALGOR_dup(alg);
|
||||
if (new_alg == NULL) {
|
||||
TSerr(TS_F_TS_MSG_IMPRINT_SET_ALGO, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
X509_ALGOR_free(a->hash_algo);
|
||||
a->hash_algo = new_alg;
|
||||
return 1;
|
||||
}
|
||||
|
||||
X509_ALGOR *TS_MSG_IMPRINT_get_algo(TS_MSG_IMPRINT *a)
|
||||
{
|
||||
return a->hash_algo;
|
||||
}
|
||||
{
|
||||
return a->hash_algo;
|
||||
}
|
||||
|
||||
int TS_MSG_IMPRINT_set_msg(TS_MSG_IMPRINT *a, unsigned char *d, int len)
|
||||
{
|
||||
return ASN1_OCTET_STRING_set(a->hashed_msg, d, len);
|
||||
}
|
||||
{
|
||||
return ASN1_OCTET_STRING_set(a->hashed_msg, d, len);
|
||||
}
|
||||
|
||||
ASN1_OCTET_STRING *TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a)
|
||||
{
|
||||
return a->hashed_msg;
|
||||
}
|
||||
{
|
||||
return a->hashed_msg;
|
||||
}
|
||||
|
||||
int TS_REQ_set_policy_id(TS_REQ *a, ASN1_OBJECT *policy)
|
||||
{
|
||||
ASN1_OBJECT *new_policy;
|
||||
{
|
||||
ASN1_OBJECT *new_policy;
|
||||
|
||||
if (a->policy_id == policy)
|
||||
return 1;
|
||||
new_policy = OBJ_dup(policy);
|
||||
if (new_policy == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_REQ_SET_POLICY_ID, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_OBJECT_free(a->policy_id);
|
||||
a->policy_id = new_policy;
|
||||
return 1;
|
||||
}
|
||||
if (a->policy_id == policy)
|
||||
return 1;
|
||||
new_policy = OBJ_dup(policy);
|
||||
if (new_policy == NULL) {
|
||||
TSerr(TS_F_TS_REQ_SET_POLICY_ID, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_OBJECT_free(a->policy_id);
|
||||
a->policy_id = new_policy;
|
||||
return 1;
|
||||
}
|
||||
|
||||
ASN1_OBJECT *TS_REQ_get_policy_id(TS_REQ *a)
|
||||
{
|
||||
return a->policy_id;
|
||||
}
|
||||
{
|
||||
return a->policy_id;
|
||||
}
|
||||
|
||||
int TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce)
|
||||
{
|
||||
ASN1_INTEGER *new_nonce;
|
||||
{
|
||||
ASN1_INTEGER *new_nonce;
|
||||
|
||||
if (a->nonce == nonce)
|
||||
return 1;
|
||||
new_nonce = ASN1_INTEGER_dup(nonce);
|
||||
if (new_nonce == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_REQ_SET_NONCE, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_INTEGER_free(a->nonce);
|
||||
a->nonce = new_nonce;
|
||||
return 1;
|
||||
}
|
||||
if (a->nonce == nonce)
|
||||
return 1;
|
||||
new_nonce = ASN1_INTEGER_dup(nonce);
|
||||
if (new_nonce == NULL) {
|
||||
TSerr(TS_F_TS_REQ_SET_NONCE, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_INTEGER_free(a->nonce);
|
||||
a->nonce = new_nonce;
|
||||
return 1;
|
||||
}
|
||||
|
||||
const ASN1_INTEGER *TS_REQ_get_nonce(const TS_REQ *a)
|
||||
{
|
||||
return a->nonce;
|
||||
}
|
||||
{
|
||||
return a->nonce;
|
||||
}
|
||||
|
||||
int TS_REQ_set_cert_req(TS_REQ *a, int cert_req)
|
||||
{
|
||||
a->cert_req = cert_req ? 0xFF : 0x00;
|
||||
return 1;
|
||||
}
|
||||
{
|
||||
a->cert_req = cert_req ? 0xFF : 0x00;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int TS_REQ_get_cert_req(const TS_REQ *a)
|
||||
{
|
||||
return a->cert_req ? 1 : 0;
|
||||
}
|
||||
{
|
||||
return a->cert_req ? 1 : 0;
|
||||
}
|
||||
|
||||
STACK_OF(X509_EXTENSION) *TS_REQ_get_exts(TS_REQ *a)
|
||||
{
|
||||
return a->extensions;
|
||||
}
|
||||
{
|
||||
return a->extensions;
|
||||
}
|
||||
|
||||
void TS_REQ_ext_free(TS_REQ *a)
|
||||
{
|
||||
if (!a) return;
|
||||
sk_X509_EXTENSION_pop_free(a->extensions, X509_EXTENSION_free);
|
||||
a->extensions = NULL;
|
||||
}
|
||||
{
|
||||
if (!a)
|
||||
return;
|
||||
sk_X509_EXTENSION_pop_free(a->extensions, X509_EXTENSION_free);
|
||||
a->extensions = NULL;
|
||||
}
|
||||
|
||||
int TS_REQ_get_ext_count(TS_REQ *a)
|
||||
{
|
||||
return X509v3_get_ext_count(a->extensions);
|
||||
}
|
||||
{
|
||||
return X509v3_get_ext_count(a->extensions);
|
||||
}
|
||||
|
||||
int TS_REQ_get_ext_by_NID(TS_REQ *a, int nid, int lastpos)
|
||||
{
|
||||
return X509v3_get_ext_by_NID(a->extensions, nid, lastpos);
|
||||
}
|
||||
{
|
||||
return X509v3_get_ext_by_NID(a->extensions, nid, lastpos);
|
||||
}
|
||||
|
||||
int TS_REQ_get_ext_by_OBJ(TS_REQ *a, ASN1_OBJECT *obj, int lastpos)
|
||||
{
|
||||
return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos);
|
||||
}
|
||||
{
|
||||
return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos);
|
||||
}
|
||||
|
||||
int TS_REQ_get_ext_by_critical(TS_REQ *a, int crit, int lastpos)
|
||||
{
|
||||
return X509v3_get_ext_by_critical(a->extensions, crit, lastpos);
|
||||
}
|
||||
{
|
||||
return X509v3_get_ext_by_critical(a->extensions, crit, lastpos);
|
||||
}
|
||||
|
||||
X509_EXTENSION *TS_REQ_get_ext(TS_REQ *a, int loc)
|
||||
{
|
||||
return X509v3_get_ext(a->extensions,loc);
|
||||
}
|
||||
{
|
||||
return X509v3_get_ext(a->extensions, loc);
|
||||
}
|
||||
|
||||
X509_EXTENSION *TS_REQ_delete_ext(TS_REQ *a, int loc)
|
||||
{
|
||||
return X509v3_delete_ext(a->extensions,loc);
|
||||
}
|
||||
{
|
||||
return X509v3_delete_ext(a->extensions, loc);
|
||||
}
|
||||
|
||||
int TS_REQ_add_ext(TS_REQ *a, X509_EXTENSION *ex, int loc)
|
||||
{
|
||||
return X509v3_add_ext(&a->extensions,ex,loc) != NULL;
|
||||
}
|
||||
{
|
||||
return X509v3_add_ext(&a->extensions, ex, loc) != NULL;
|
||||
}
|
||||
|
||||
void *TS_REQ_get_ext_d2i(TS_REQ *a, int nid, int *crit, int *idx)
|
||||
{
|
||||
return X509V3_get_d2i(a->extensions, nid, crit, idx);
|
||||
}
|
||||
{
|
||||
return X509V3_get_d2i(a->extensions, nid, crit, idx);
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -1,6 +1,7 @@
|
||||
/* crypto/ts/ts_resp_print.c */
|
||||
/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
|
||||
* project 2002.
|
||||
/*
|
||||
* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL project
|
||||
* 2002.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
|
||||
@@ -10,7 +11,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -63,225 +64,218 @@
|
||||
#include <openssl/x509v3.h>
|
||||
#include "ts.h"
|
||||
|
||||
struct status_map_st
|
||||
{
|
||||
int bit;
|
||||
const char *text;
|
||||
};
|
||||
struct status_map_st {
|
||||
int bit;
|
||||
const char *text;
|
||||
};
|
||||
|
||||
/* Local function declarations. */
|
||||
|
||||
static int TS_status_map_print(BIO *bio, struct status_map_st *a,
|
||||
ASN1_BIT_STRING *v);
|
||||
ASN1_BIT_STRING *v);
|
||||
static int TS_ACCURACY_print_bio(BIO *bio, const TS_ACCURACY *accuracy);
|
||||
|
||||
/* Function definitions. */
|
||||
|
||||
int TS_RESP_print_bio(BIO *bio, TS_RESP *a)
|
||||
{
|
||||
TS_TST_INFO *tst_info;
|
||||
{
|
||||
TS_TST_INFO *tst_info;
|
||||
|
||||
BIO_printf(bio, "Status info:\n");
|
||||
TS_STATUS_INFO_print_bio(bio, TS_RESP_get_status_info(a));
|
||||
BIO_printf(bio, "Status info:\n");
|
||||
TS_STATUS_INFO_print_bio(bio, TS_RESP_get_status_info(a));
|
||||
|
||||
BIO_printf(bio, "\nTST info:\n");
|
||||
tst_info = TS_RESP_get_tst_info(a);
|
||||
if (tst_info != NULL)
|
||||
TS_TST_INFO_print_bio(bio, TS_RESP_get_tst_info(a));
|
||||
else
|
||||
BIO_printf(bio, "Not included.\n");
|
||||
|
||||
return 1;
|
||||
}
|
||||
BIO_printf(bio, "\nTST info:\n");
|
||||
tst_info = TS_RESP_get_tst_info(a);
|
||||
if (tst_info != NULL)
|
||||
TS_TST_INFO_print_bio(bio, TS_RESP_get_tst_info(a));
|
||||
else
|
||||
BIO_printf(bio, "Not included.\n");
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a)
|
||||
{
|
||||
static const char *status_map[] =
|
||||
{
|
||||
"Granted.",
|
||||
"Granted with modifications.",
|
||||
"Rejected.",
|
||||
"Waiting.",
|
||||
"Revocation warning.",
|
||||
"Revoked."
|
||||
};
|
||||
static struct status_map_st failure_map[] =
|
||||
{
|
||||
{ TS_INFO_BAD_ALG,
|
||||
"unrecognized or unsupported algorithm identifier" },
|
||||
{ TS_INFO_BAD_REQUEST,
|
||||
"transaction not permitted or supported" },
|
||||
{ TS_INFO_BAD_DATA_FORMAT,
|
||||
"the data submitted has the wrong format" },
|
||||
{ TS_INFO_TIME_NOT_AVAILABLE,
|
||||
"the TSA's time source is not available" },
|
||||
{ TS_INFO_UNACCEPTED_POLICY,
|
||||
"the requested TSA policy is not supported by the TSA" },
|
||||
{ TS_INFO_UNACCEPTED_EXTENSION,
|
||||
"the requested extension is not supported by the TSA" },
|
||||
{ TS_INFO_ADD_INFO_NOT_AVAILABLE,
|
||||
"the additional information requested could not be understood "
|
||||
"or is not available" },
|
||||
{ TS_INFO_SYSTEM_FAILURE,
|
||||
"the request cannot be handled due to system failure" },
|
||||
{ -1, NULL }
|
||||
};
|
||||
long status;
|
||||
int i, lines = 0;
|
||||
{
|
||||
static const char *status_map[] = {
|
||||
"Granted.",
|
||||
"Granted with modifications.",
|
||||
"Rejected.",
|
||||
"Waiting.",
|
||||
"Revocation warning.",
|
||||
"Revoked."
|
||||
};
|
||||
static struct status_map_st failure_map[] = {
|
||||
{TS_INFO_BAD_ALG,
|
||||
"unrecognized or unsupported algorithm identifier"},
|
||||
{TS_INFO_BAD_REQUEST,
|
||||
"transaction not permitted or supported"},
|
||||
{TS_INFO_BAD_DATA_FORMAT,
|
||||
"the data submitted has the wrong format"},
|
||||
{TS_INFO_TIME_NOT_AVAILABLE,
|
||||
"the TSA's time source is not available"},
|
||||
{TS_INFO_UNACCEPTED_POLICY,
|
||||
"the requested TSA policy is not supported by the TSA"},
|
||||
{TS_INFO_UNACCEPTED_EXTENSION,
|
||||
"the requested extension is not supported by the TSA"},
|
||||
{TS_INFO_ADD_INFO_NOT_AVAILABLE,
|
||||
"the additional information requested could not be understood "
|
||||
"or is not available"},
|
||||
{TS_INFO_SYSTEM_FAILURE,
|
||||
"the request cannot be handled due to system failure"},
|
||||
{-1, NULL}
|
||||
};
|
||||
long status;
|
||||
int i, lines = 0;
|
||||
|
||||
/* Printing status code. */
|
||||
BIO_printf(bio, "Status: ");
|
||||
status = ASN1_INTEGER_get(a->status);
|
||||
if (0 <= status && status < (long)(sizeof(status_map)/sizeof(status_map[0])))
|
||||
BIO_printf(bio, "%s\n", status_map[status]);
|
||||
else
|
||||
BIO_printf(bio, "out of bounds\n");
|
||||
|
||||
/* Printing status description. */
|
||||
BIO_printf(bio, "Status description: ");
|
||||
for (i = 0; i < sk_ASN1_UTF8STRING_num(a->text); ++i)
|
||||
{
|
||||
if (i > 0)
|
||||
BIO_puts(bio, "\t");
|
||||
ASN1_STRING_print_ex(bio, sk_ASN1_UTF8STRING_value(a->text, i),
|
||||
0);
|
||||
BIO_puts(bio, "\n");
|
||||
}
|
||||
if (i == 0)
|
||||
BIO_printf(bio, "unspecified\n");
|
||||
/* Printing status code. */
|
||||
BIO_printf(bio, "Status: ");
|
||||
status = ASN1_INTEGER_get(a->status);
|
||||
if (0 <= status
|
||||
&& status < (long)(sizeof(status_map) / sizeof(status_map[0])))
|
||||
BIO_printf(bio, "%s\n", status_map[status]);
|
||||
else
|
||||
BIO_printf(bio, "out of bounds\n");
|
||||
|
||||
/* Printing failure information. */
|
||||
BIO_printf(bio, "Failure info: ");
|
||||
if (a->failure_info != NULL)
|
||||
lines = TS_status_map_print(bio, failure_map,
|
||||
a->failure_info);
|
||||
if (lines == 0)
|
||||
BIO_printf(bio, "unspecified");
|
||||
BIO_printf(bio, "\n");
|
||||
/* Printing status description. */
|
||||
BIO_printf(bio, "Status description: ");
|
||||
for (i = 0; i < sk_ASN1_UTF8STRING_num(a->text); ++i) {
|
||||
if (i > 0)
|
||||
BIO_puts(bio, "\t");
|
||||
ASN1_STRING_print_ex(bio, sk_ASN1_UTF8STRING_value(a->text, i), 0);
|
||||
BIO_puts(bio, "\n");
|
||||
}
|
||||
if (i == 0)
|
||||
BIO_printf(bio, "unspecified\n");
|
||||
|
||||
return 1;
|
||||
}
|
||||
/* Printing failure information. */
|
||||
BIO_printf(bio, "Failure info: ");
|
||||
if (a->failure_info != NULL)
|
||||
lines = TS_status_map_print(bio, failure_map, a->failure_info);
|
||||
if (lines == 0)
|
||||
BIO_printf(bio, "unspecified");
|
||||
BIO_printf(bio, "\n");
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int TS_status_map_print(BIO *bio, struct status_map_st *a,
|
||||
ASN1_BIT_STRING *v)
|
||||
{
|
||||
int lines = 0;
|
||||
ASN1_BIT_STRING *v)
|
||||
{
|
||||
int lines = 0;
|
||||
|
||||
for (; a->bit >= 0; ++a)
|
||||
{
|
||||
if (ASN1_BIT_STRING_get_bit(v, a->bit))
|
||||
{
|
||||
if (++lines > 1)
|
||||
BIO_printf(bio, ", ");
|
||||
BIO_printf(bio, "%s", a->text);
|
||||
}
|
||||
}
|
||||
for (; a->bit >= 0; ++a) {
|
||||
if (ASN1_BIT_STRING_get_bit(v, a->bit)) {
|
||||
if (++lines > 1)
|
||||
BIO_printf(bio, ", ");
|
||||
BIO_printf(bio, "%s", a->text);
|
||||
}
|
||||
}
|
||||
|
||||
return lines;
|
||||
}
|
||||
return lines;
|
||||
}
|
||||
|
||||
int TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a)
|
||||
{
|
||||
int v;
|
||||
ASN1_OBJECT *policy_id;
|
||||
const ASN1_INTEGER *serial;
|
||||
const ASN1_GENERALIZEDTIME *gtime;
|
||||
TS_ACCURACY *accuracy;
|
||||
const ASN1_INTEGER *nonce;
|
||||
GENERAL_NAME *tsa_name;
|
||||
{
|
||||
int v;
|
||||
ASN1_OBJECT *policy_id;
|
||||
const ASN1_INTEGER *serial;
|
||||
const ASN1_GENERALIZEDTIME *gtime;
|
||||
TS_ACCURACY *accuracy;
|
||||
const ASN1_INTEGER *nonce;
|
||||
GENERAL_NAME *tsa_name;
|
||||
|
||||
if (a == NULL) return 0;
|
||||
if (a == NULL)
|
||||
return 0;
|
||||
|
||||
/* Print version. */
|
||||
v = TS_TST_INFO_get_version(a);
|
||||
BIO_printf(bio, "Version: %d\n", v);
|
||||
/* Print version. */
|
||||
v = TS_TST_INFO_get_version(a);
|
||||
BIO_printf(bio, "Version: %d\n", v);
|
||||
|
||||
/* Print policy id. */
|
||||
BIO_printf(bio, "Policy OID: ");
|
||||
policy_id = TS_TST_INFO_get_policy_id(a);
|
||||
TS_OBJ_print_bio(bio, policy_id);
|
||||
/* Print policy id. */
|
||||
BIO_printf(bio, "Policy OID: ");
|
||||
policy_id = TS_TST_INFO_get_policy_id(a);
|
||||
TS_OBJ_print_bio(bio, policy_id);
|
||||
|
||||
/* Print message imprint. */
|
||||
TS_MSG_IMPRINT_print_bio(bio, TS_TST_INFO_get_msg_imprint(a));
|
||||
/* Print message imprint. */
|
||||
TS_MSG_IMPRINT_print_bio(bio, TS_TST_INFO_get_msg_imprint(a));
|
||||
|
||||
/* Print serial number. */
|
||||
BIO_printf(bio, "Serial number: ");
|
||||
serial = TS_TST_INFO_get_serial(a);
|
||||
if (serial == NULL)
|
||||
BIO_printf(bio, "unspecified");
|
||||
else
|
||||
TS_ASN1_INTEGER_print_bio(bio, serial);
|
||||
BIO_write(bio, "\n", 1);
|
||||
/* Print serial number. */
|
||||
BIO_printf(bio, "Serial number: ");
|
||||
serial = TS_TST_INFO_get_serial(a);
|
||||
if (serial == NULL)
|
||||
BIO_printf(bio, "unspecified");
|
||||
else
|
||||
TS_ASN1_INTEGER_print_bio(bio, serial);
|
||||
BIO_write(bio, "\n", 1);
|
||||
|
||||
/* Print time stamp. */
|
||||
BIO_printf(bio, "Time stamp: ");
|
||||
gtime = TS_TST_INFO_get_time(a);
|
||||
ASN1_GENERALIZEDTIME_print(bio, gtime);
|
||||
BIO_write(bio, "\n", 1);
|
||||
/* Print time stamp. */
|
||||
BIO_printf(bio, "Time stamp: ");
|
||||
gtime = TS_TST_INFO_get_time(a);
|
||||
ASN1_GENERALIZEDTIME_print(bio, gtime);
|
||||
BIO_write(bio, "\n", 1);
|
||||
|
||||
/* Print accuracy. */
|
||||
BIO_printf(bio, "Accuracy: ");
|
||||
accuracy = TS_TST_INFO_get_accuracy(a);
|
||||
if (accuracy == NULL)
|
||||
BIO_printf(bio, "unspecified");
|
||||
else
|
||||
TS_ACCURACY_print_bio(bio, accuracy);
|
||||
BIO_write(bio, "\n", 1);
|
||||
/* Print accuracy. */
|
||||
BIO_printf(bio, "Accuracy: ");
|
||||
accuracy = TS_TST_INFO_get_accuracy(a);
|
||||
if (accuracy == NULL)
|
||||
BIO_printf(bio, "unspecified");
|
||||
else
|
||||
TS_ACCURACY_print_bio(bio, accuracy);
|
||||
BIO_write(bio, "\n", 1);
|
||||
|
||||
/* Print ordering. */
|
||||
BIO_printf(bio, "Ordering: %s\n",
|
||||
TS_TST_INFO_get_ordering(a) ? "yes" : "no");
|
||||
/* Print ordering. */
|
||||
BIO_printf(bio, "Ordering: %s\n",
|
||||
TS_TST_INFO_get_ordering(a) ? "yes" : "no");
|
||||
|
||||
/* Print nonce. */
|
||||
BIO_printf(bio, "Nonce: ");
|
||||
nonce = TS_TST_INFO_get_nonce(a);
|
||||
if (nonce == NULL)
|
||||
BIO_printf(bio, "unspecified");
|
||||
else
|
||||
TS_ASN1_INTEGER_print_bio(bio, nonce);
|
||||
BIO_write(bio, "\n", 1);
|
||||
/* Print nonce. */
|
||||
BIO_printf(bio, "Nonce: ");
|
||||
nonce = TS_TST_INFO_get_nonce(a);
|
||||
if (nonce == NULL)
|
||||
BIO_printf(bio, "unspecified");
|
||||
else
|
||||
TS_ASN1_INTEGER_print_bio(bio, nonce);
|
||||
BIO_write(bio, "\n", 1);
|
||||
|
||||
/* Print TSA name. */
|
||||
BIO_printf(bio, "TSA: ");
|
||||
tsa_name = TS_TST_INFO_get_tsa(a);
|
||||
if (tsa_name == NULL)
|
||||
BIO_printf(bio, "unspecified");
|
||||
else
|
||||
{
|
||||
STACK_OF(CONF_VALUE) *nval;
|
||||
if ((nval = i2v_GENERAL_NAME(NULL, tsa_name, NULL)))
|
||||
X509V3_EXT_val_prn(bio, nval, 0, 0);
|
||||
sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
|
||||
}
|
||||
BIO_write(bio, "\n", 1);
|
||||
/* Print TSA name. */
|
||||
BIO_printf(bio, "TSA: ");
|
||||
tsa_name = TS_TST_INFO_get_tsa(a);
|
||||
if (tsa_name == NULL)
|
||||
BIO_printf(bio, "unspecified");
|
||||
else {
|
||||
STACK_OF(CONF_VALUE) *nval;
|
||||
if ((nval = i2v_GENERAL_NAME(NULL, tsa_name, NULL)))
|
||||
X509V3_EXT_val_prn(bio, nval, 0, 0);
|
||||
sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
|
||||
}
|
||||
BIO_write(bio, "\n", 1);
|
||||
|
||||
/* Print extensions. */
|
||||
TS_ext_print_bio(bio, TS_TST_INFO_get_exts(a));
|
||||
/* Print extensions. */
|
||||
TS_ext_print_bio(bio, TS_TST_INFO_get_exts(a));
|
||||
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int TS_ACCURACY_print_bio(BIO *bio, const TS_ACCURACY *accuracy)
|
||||
{
|
||||
const ASN1_INTEGER *seconds = TS_ACCURACY_get_seconds(accuracy);
|
||||
const ASN1_INTEGER *millis = TS_ACCURACY_get_millis(accuracy);
|
||||
const ASN1_INTEGER *micros = TS_ACCURACY_get_micros(accuracy);
|
||||
{
|
||||
const ASN1_INTEGER *seconds = TS_ACCURACY_get_seconds(accuracy);
|
||||
const ASN1_INTEGER *millis = TS_ACCURACY_get_millis(accuracy);
|
||||
const ASN1_INTEGER *micros = TS_ACCURACY_get_micros(accuracy);
|
||||
|
||||
if (seconds != NULL)
|
||||
TS_ASN1_INTEGER_print_bio(bio, seconds);
|
||||
else
|
||||
BIO_printf(bio, "unspecified");
|
||||
BIO_printf(bio, " seconds, ");
|
||||
if (millis != NULL)
|
||||
TS_ASN1_INTEGER_print_bio(bio, millis);
|
||||
else
|
||||
BIO_printf(bio, "unspecified");
|
||||
BIO_printf(bio, " millis, ");
|
||||
if (micros != NULL)
|
||||
TS_ASN1_INTEGER_print_bio(bio, micros);
|
||||
else
|
||||
BIO_printf(bio, "unspecified");
|
||||
BIO_printf(bio, " micros");
|
||||
if (seconds != NULL)
|
||||
TS_ASN1_INTEGER_print_bio(bio, seconds);
|
||||
else
|
||||
BIO_printf(bio, "unspecified");
|
||||
BIO_printf(bio, " seconds, ");
|
||||
if (millis != NULL)
|
||||
TS_ASN1_INTEGER_print_bio(bio, millis);
|
||||
else
|
||||
BIO_printf(bio, "unspecified");
|
||||
BIO_printf(bio, " millis, ");
|
||||
if (micros != NULL)
|
||||
TS_ASN1_INTEGER_print_bio(bio, micros);
|
||||
else
|
||||
BIO_printf(bio, "unspecified");
|
||||
BIO_printf(bio, " micros");
|
||||
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@@ -1,6 +1,7 @@
|
||||
/* crypto/ts/ts_resp_utils.c */
|
||||
/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
|
||||
* project 2002.
|
||||
/*
|
||||
* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL project
|
||||
* 2002.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
|
||||
@@ -10,7 +11,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -65,345 +66,331 @@
|
||||
/* Function definitions. */
|
||||
|
||||
int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *status_info)
|
||||
{
|
||||
TS_STATUS_INFO *new_status_info;
|
||||
{
|
||||
TS_STATUS_INFO *new_status_info;
|
||||
|
||||
if (a->status_info == status_info)
|
||||
return 1;
|
||||
new_status_info = TS_STATUS_INFO_dup(status_info);
|
||||
if (new_status_info == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_RESP_SET_STATUS_INFO, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
TS_STATUS_INFO_free(a->status_info);
|
||||
a->status_info = new_status_info;
|
||||
if (a->status_info == status_info)
|
||||
return 1;
|
||||
new_status_info = TS_STATUS_INFO_dup(status_info);
|
||||
if (new_status_info == NULL) {
|
||||
TSerr(TS_F_TS_RESP_SET_STATUS_INFO, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
TS_STATUS_INFO_free(a->status_info);
|
||||
a->status_info = new_status_info;
|
||||
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
TS_STATUS_INFO *TS_RESP_get_status_info(TS_RESP *a)
|
||||
{
|
||||
return a->status_info;
|
||||
}
|
||||
{
|
||||
return a->status_info;
|
||||
}
|
||||
|
||||
/* Caller loses ownership of PKCS7 and TS_TST_INFO objects. */
|
||||
void TS_RESP_set_tst_info(TS_RESP *a, PKCS7 *p7, TS_TST_INFO *tst_info)
|
||||
{
|
||||
/* Set new PKCS7 and TST_INFO objects. */
|
||||
PKCS7_free(a->token);
|
||||
a->token = p7;
|
||||
TS_TST_INFO_free(a->tst_info);
|
||||
a->tst_info = tst_info;
|
||||
}
|
||||
{
|
||||
/* Set new PKCS7 and TST_INFO objects. */
|
||||
PKCS7_free(a->token);
|
||||
a->token = p7;
|
||||
TS_TST_INFO_free(a->tst_info);
|
||||
a->tst_info = tst_info;
|
||||
}
|
||||
|
||||
PKCS7 *TS_RESP_get_token(TS_RESP *a)
|
||||
{
|
||||
return a->token;
|
||||
}
|
||||
{
|
||||
return a->token;
|
||||
}
|
||||
|
||||
TS_TST_INFO *TS_RESP_get_tst_info(TS_RESP *a)
|
||||
{
|
||||
return a->tst_info;
|
||||
}
|
||||
{
|
||||
return a->tst_info;
|
||||
}
|
||||
|
||||
int TS_TST_INFO_set_version(TS_TST_INFO *a, long version)
|
||||
{
|
||||
return ASN1_INTEGER_set(a->version, version);
|
||||
}
|
||||
{
|
||||
return ASN1_INTEGER_set(a->version, version);
|
||||
}
|
||||
|
||||
long TS_TST_INFO_get_version(const TS_TST_INFO *a)
|
||||
{
|
||||
return ASN1_INTEGER_get(a->version);
|
||||
}
|
||||
{
|
||||
return ASN1_INTEGER_get(a->version);
|
||||
}
|
||||
|
||||
int TS_TST_INFO_set_policy_id(TS_TST_INFO *a, ASN1_OBJECT *policy)
|
||||
{
|
||||
ASN1_OBJECT *new_policy;
|
||||
{
|
||||
ASN1_OBJECT *new_policy;
|
||||
|
||||
if (a->policy_id == policy)
|
||||
return 1;
|
||||
new_policy = OBJ_dup(policy);
|
||||
if (new_policy == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_TST_INFO_SET_POLICY_ID, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_OBJECT_free(a->policy_id);
|
||||
a->policy_id = new_policy;
|
||||
return 1;
|
||||
}
|
||||
if (a->policy_id == policy)
|
||||
return 1;
|
||||
new_policy = OBJ_dup(policy);
|
||||
if (new_policy == NULL) {
|
||||
TSerr(TS_F_TS_TST_INFO_SET_POLICY_ID, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_OBJECT_free(a->policy_id);
|
||||
a->policy_id = new_policy;
|
||||
return 1;
|
||||
}
|
||||
|
||||
ASN1_OBJECT *TS_TST_INFO_get_policy_id(TS_TST_INFO *a)
|
||||
{
|
||||
return a->policy_id;
|
||||
}
|
||||
{
|
||||
return a->policy_id;
|
||||
}
|
||||
|
||||
int TS_TST_INFO_set_msg_imprint(TS_TST_INFO *a, TS_MSG_IMPRINT *msg_imprint)
|
||||
{
|
||||
TS_MSG_IMPRINT *new_msg_imprint;
|
||||
{
|
||||
TS_MSG_IMPRINT *new_msg_imprint;
|
||||
|
||||
if (a->msg_imprint == msg_imprint)
|
||||
return 1;
|
||||
new_msg_imprint = TS_MSG_IMPRINT_dup(msg_imprint);
|
||||
if (new_msg_imprint == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_TST_INFO_SET_MSG_IMPRINT, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
TS_MSG_IMPRINT_free(a->msg_imprint);
|
||||
a->msg_imprint = new_msg_imprint;
|
||||
return 1;
|
||||
}
|
||||
if (a->msg_imprint == msg_imprint)
|
||||
return 1;
|
||||
new_msg_imprint = TS_MSG_IMPRINT_dup(msg_imprint);
|
||||
if (new_msg_imprint == NULL) {
|
||||
TSerr(TS_F_TS_TST_INFO_SET_MSG_IMPRINT, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
TS_MSG_IMPRINT_free(a->msg_imprint);
|
||||
a->msg_imprint = new_msg_imprint;
|
||||
return 1;
|
||||
}
|
||||
|
||||
TS_MSG_IMPRINT *TS_TST_INFO_get_msg_imprint(TS_TST_INFO *a)
|
||||
{
|
||||
return a->msg_imprint;
|
||||
}
|
||||
{
|
||||
return a->msg_imprint;
|
||||
}
|
||||
|
||||
int TS_TST_INFO_set_serial(TS_TST_INFO *a, const ASN1_INTEGER *serial)
|
||||
{
|
||||
ASN1_INTEGER *new_serial;
|
||||
{
|
||||
ASN1_INTEGER *new_serial;
|
||||
|
||||
if (a->serial == serial)
|
||||
return 1;
|
||||
new_serial = ASN1_INTEGER_dup(serial);
|
||||
if (new_serial == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_TST_INFO_SET_SERIAL, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_INTEGER_free(a->serial);
|
||||
a->serial = new_serial;
|
||||
return 1;
|
||||
}
|
||||
if (a->serial == serial)
|
||||
return 1;
|
||||
new_serial = ASN1_INTEGER_dup(serial);
|
||||
if (new_serial == NULL) {
|
||||
TSerr(TS_F_TS_TST_INFO_SET_SERIAL, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_INTEGER_free(a->serial);
|
||||
a->serial = new_serial;
|
||||
return 1;
|
||||
}
|
||||
|
||||
const ASN1_INTEGER *TS_TST_INFO_get_serial(const TS_TST_INFO *a)
|
||||
{
|
||||
return a->serial;
|
||||
}
|
||||
{
|
||||
return a->serial;
|
||||
}
|
||||
|
||||
int TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime)
|
||||
{
|
||||
ASN1_GENERALIZEDTIME *new_time;
|
||||
{
|
||||
ASN1_GENERALIZEDTIME *new_time;
|
||||
|
||||
if (a->time == gtime)
|
||||
return 1;
|
||||
new_time = M_ASN1_GENERALIZEDTIME_dup(gtime);
|
||||
if (new_time == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_TST_INFO_SET_TIME, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_GENERALIZEDTIME_free(a->time);
|
||||
a->time = new_time;
|
||||
return 1;
|
||||
}
|
||||
if (a->time == gtime)
|
||||
return 1;
|
||||
new_time = M_ASN1_GENERALIZEDTIME_dup(gtime);
|
||||
if (new_time == NULL) {
|
||||
TSerr(TS_F_TS_TST_INFO_SET_TIME, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_GENERALIZEDTIME_free(a->time);
|
||||
a->time = new_time;
|
||||
return 1;
|
||||
}
|
||||
|
||||
const ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(const TS_TST_INFO *a)
|
||||
{
|
||||
return a->time;
|
||||
}
|
||||
{
|
||||
return a->time;
|
||||
}
|
||||
|
||||
int TS_TST_INFO_set_accuracy(TS_TST_INFO *a, TS_ACCURACY *accuracy)
|
||||
{
|
||||
TS_ACCURACY *new_accuracy;
|
||||
{
|
||||
TS_ACCURACY *new_accuracy;
|
||||
|
||||
if (a->accuracy == accuracy)
|
||||
return 1;
|
||||
new_accuracy = TS_ACCURACY_dup(accuracy);
|
||||
if (new_accuracy == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_TST_INFO_SET_ACCURACY, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
TS_ACCURACY_free(a->accuracy);
|
||||
a->accuracy = new_accuracy;
|
||||
return 1;
|
||||
}
|
||||
if (a->accuracy == accuracy)
|
||||
return 1;
|
||||
new_accuracy = TS_ACCURACY_dup(accuracy);
|
||||
if (new_accuracy == NULL) {
|
||||
TSerr(TS_F_TS_TST_INFO_SET_ACCURACY, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
TS_ACCURACY_free(a->accuracy);
|
||||
a->accuracy = new_accuracy;
|
||||
return 1;
|
||||
}
|
||||
|
||||
TS_ACCURACY *TS_TST_INFO_get_accuracy(TS_TST_INFO *a)
|
||||
{
|
||||
return a->accuracy;
|
||||
}
|
||||
{
|
||||
return a->accuracy;
|
||||
}
|
||||
|
||||
int TS_ACCURACY_set_seconds(TS_ACCURACY *a, const ASN1_INTEGER *seconds)
|
||||
{
|
||||
ASN1_INTEGER *new_seconds;
|
||||
{
|
||||
ASN1_INTEGER *new_seconds;
|
||||
|
||||
if (a->seconds == seconds)
|
||||
return 1;
|
||||
new_seconds = ASN1_INTEGER_dup(seconds);
|
||||
if (new_seconds == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_ACCURACY_SET_SECONDS, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_INTEGER_free(a->seconds);
|
||||
a->seconds = new_seconds;
|
||||
return 1;
|
||||
}
|
||||
if (a->seconds == seconds)
|
||||
return 1;
|
||||
new_seconds = ASN1_INTEGER_dup(seconds);
|
||||
if (new_seconds == NULL) {
|
||||
TSerr(TS_F_TS_ACCURACY_SET_SECONDS, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_INTEGER_free(a->seconds);
|
||||
a->seconds = new_seconds;
|
||||
return 1;
|
||||
}
|
||||
|
||||
const ASN1_INTEGER *TS_ACCURACY_get_seconds(const TS_ACCURACY *a)
|
||||
{
|
||||
return a->seconds;
|
||||
}
|
||||
{
|
||||
return a->seconds;
|
||||
}
|
||||
|
||||
int TS_ACCURACY_set_millis(TS_ACCURACY *a, const ASN1_INTEGER *millis)
|
||||
{
|
||||
ASN1_INTEGER *new_millis = NULL;
|
||||
{
|
||||
ASN1_INTEGER *new_millis = NULL;
|
||||
|
||||
if (a->millis == millis)
|
||||
return 1;
|
||||
if (millis != NULL)
|
||||
{
|
||||
new_millis = ASN1_INTEGER_dup(millis);
|
||||
if (new_millis == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_ACCURACY_SET_MILLIS,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
ASN1_INTEGER_free(a->millis);
|
||||
a->millis = new_millis;
|
||||
return 1;
|
||||
}
|
||||
if (a->millis == millis)
|
||||
return 1;
|
||||
if (millis != NULL) {
|
||||
new_millis = ASN1_INTEGER_dup(millis);
|
||||
if (new_millis == NULL) {
|
||||
TSerr(TS_F_TS_ACCURACY_SET_MILLIS, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
ASN1_INTEGER_free(a->millis);
|
||||
a->millis = new_millis;
|
||||
return 1;
|
||||
}
|
||||
|
||||
const ASN1_INTEGER *TS_ACCURACY_get_millis(const TS_ACCURACY *a)
|
||||
{
|
||||
return a->millis;
|
||||
}
|
||||
{
|
||||
return a->millis;
|
||||
}
|
||||
|
||||
int TS_ACCURACY_set_micros(TS_ACCURACY *a, const ASN1_INTEGER *micros)
|
||||
{
|
||||
ASN1_INTEGER *new_micros = NULL;
|
||||
{
|
||||
ASN1_INTEGER *new_micros = NULL;
|
||||
|
||||
if (a->micros == micros)
|
||||
return 1;
|
||||
if (micros != NULL)
|
||||
{
|
||||
new_micros = ASN1_INTEGER_dup(micros);
|
||||
if (new_micros == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_ACCURACY_SET_MICROS,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
ASN1_INTEGER_free(a->micros);
|
||||
a->micros = new_micros;
|
||||
return 1;
|
||||
}
|
||||
if (a->micros == micros)
|
||||
return 1;
|
||||
if (micros != NULL) {
|
||||
new_micros = ASN1_INTEGER_dup(micros);
|
||||
if (new_micros == NULL) {
|
||||
TSerr(TS_F_TS_ACCURACY_SET_MICROS, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
ASN1_INTEGER_free(a->micros);
|
||||
a->micros = new_micros;
|
||||
return 1;
|
||||
}
|
||||
|
||||
const ASN1_INTEGER *TS_ACCURACY_get_micros(const TS_ACCURACY *a)
|
||||
{
|
||||
return a->micros;
|
||||
}
|
||||
{
|
||||
return a->micros;
|
||||
}
|
||||
|
||||
int TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering)
|
||||
{
|
||||
a->ordering = ordering ? 0xFF : 0x00;
|
||||
return 1;
|
||||
}
|
||||
{
|
||||
a->ordering = ordering ? 0xFF : 0x00;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int TS_TST_INFO_get_ordering(const TS_TST_INFO *a)
|
||||
{
|
||||
return a->ordering ? 1 : 0;
|
||||
}
|
||||
{
|
||||
return a->ordering ? 1 : 0;
|
||||
}
|
||||
|
||||
int TS_TST_INFO_set_nonce(TS_TST_INFO *a, const ASN1_INTEGER *nonce)
|
||||
{
|
||||
ASN1_INTEGER *new_nonce;
|
||||
{
|
||||
ASN1_INTEGER *new_nonce;
|
||||
|
||||
if (a->nonce == nonce)
|
||||
return 1;
|
||||
new_nonce = ASN1_INTEGER_dup(nonce);
|
||||
if (new_nonce == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_TST_INFO_SET_NONCE, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_INTEGER_free(a->nonce);
|
||||
a->nonce = new_nonce;
|
||||
return 1;
|
||||
}
|
||||
if (a->nonce == nonce)
|
||||
return 1;
|
||||
new_nonce = ASN1_INTEGER_dup(nonce);
|
||||
if (new_nonce == NULL) {
|
||||
TSerr(TS_F_TS_TST_INFO_SET_NONCE, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ASN1_INTEGER_free(a->nonce);
|
||||
a->nonce = new_nonce;
|
||||
return 1;
|
||||
}
|
||||
|
||||
const ASN1_INTEGER *TS_TST_INFO_get_nonce(const TS_TST_INFO *a)
|
||||
{
|
||||
return a->nonce;
|
||||
}
|
||||
{
|
||||
return a->nonce;
|
||||
}
|
||||
|
||||
int TS_TST_INFO_set_tsa(TS_TST_INFO *a, GENERAL_NAME *tsa)
|
||||
{
|
||||
GENERAL_NAME *new_tsa;
|
||||
{
|
||||
GENERAL_NAME *new_tsa;
|
||||
|
||||
if (a->tsa == tsa)
|
||||
return 1;
|
||||
new_tsa = GENERAL_NAME_dup(tsa);
|
||||
if (new_tsa == NULL)
|
||||
{
|
||||
TSerr(TS_F_TS_TST_INFO_SET_TSA, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
GENERAL_NAME_free(a->tsa);
|
||||
a->tsa = new_tsa;
|
||||
return 1;
|
||||
}
|
||||
if (a->tsa == tsa)
|
||||
return 1;
|
||||
new_tsa = GENERAL_NAME_dup(tsa);
|
||||
if (new_tsa == NULL) {
|
||||
TSerr(TS_F_TS_TST_INFO_SET_TSA, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
GENERAL_NAME_free(a->tsa);
|
||||
a->tsa = new_tsa;
|
||||
return 1;
|
||||
}
|
||||
|
||||
GENERAL_NAME *TS_TST_INFO_get_tsa(TS_TST_INFO *a)
|
||||
{
|
||||
return a->tsa;
|
||||
}
|
||||
{
|
||||
return a->tsa;
|
||||
}
|
||||
|
||||
STACK_OF(X509_EXTENSION) *TS_TST_INFO_get_exts(TS_TST_INFO *a)
|
||||
{
|
||||
return a->extensions;
|
||||
}
|
||||
{
|
||||
return a->extensions;
|
||||
}
|
||||
|
||||
void TS_TST_INFO_ext_free(TS_TST_INFO *a)
|
||||
{
|
||||
if (!a) return;
|
||||
sk_X509_EXTENSION_pop_free(a->extensions, X509_EXTENSION_free);
|
||||
a->extensions = NULL;
|
||||
}
|
||||
{
|
||||
if (!a)
|
||||
return;
|
||||
sk_X509_EXTENSION_pop_free(a->extensions, X509_EXTENSION_free);
|
||||
a->extensions = NULL;
|
||||
}
|
||||
|
||||
int TS_TST_INFO_get_ext_count(TS_TST_INFO *a)
|
||||
{
|
||||
return X509v3_get_ext_count(a->extensions);
|
||||
}
|
||||
{
|
||||
return X509v3_get_ext_count(a->extensions);
|
||||
}
|
||||
|
||||
int TS_TST_INFO_get_ext_by_NID(TS_TST_INFO *a, int nid, int lastpos)
|
||||
{
|
||||
return X509v3_get_ext_by_NID(a->extensions, nid, lastpos);
|
||||
}
|
||||
{
|
||||
return X509v3_get_ext_by_NID(a->extensions, nid, lastpos);
|
||||
}
|
||||
|
||||
int TS_TST_INFO_get_ext_by_OBJ(TS_TST_INFO *a, ASN1_OBJECT *obj, int lastpos)
|
||||
{
|
||||
return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos);
|
||||
}
|
||||
{
|
||||
return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos);
|
||||
}
|
||||
|
||||
int TS_TST_INFO_get_ext_by_critical(TS_TST_INFO *a, int crit, int lastpos)
|
||||
{
|
||||
return X509v3_get_ext_by_critical(a->extensions, crit, lastpos);
|
||||
}
|
||||
{
|
||||
return X509v3_get_ext_by_critical(a->extensions, crit, lastpos);
|
||||
}
|
||||
|
||||
X509_EXTENSION *TS_TST_INFO_get_ext(TS_TST_INFO *a, int loc)
|
||||
{
|
||||
return X509v3_get_ext(a->extensions,loc);
|
||||
}
|
||||
{
|
||||
return X509v3_get_ext(a->extensions, loc);
|
||||
}
|
||||
|
||||
X509_EXTENSION *TS_TST_INFO_delete_ext(TS_TST_INFO *a, int loc)
|
||||
{
|
||||
return X509v3_delete_ext(a->extensions,loc);
|
||||
}
|
||||
{
|
||||
return X509v3_delete_ext(a->extensions, loc);
|
||||
}
|
||||
|
||||
int TS_TST_INFO_add_ext(TS_TST_INFO *a, X509_EXTENSION *ex, int loc)
|
||||
{
|
||||
return X509v3_add_ext(&a->extensions,ex,loc) != NULL;
|
||||
}
|
||||
{
|
||||
return X509v3_add_ext(&a->extensions, ex, loc) != NULL;
|
||||
}
|
||||
|
||||
void *TS_TST_INFO_get_ext_d2i(TS_TST_INFO *a, int nid, int *crit, int *idx)
|
||||
{
|
||||
return X509V3_get_d2i(a->extensions, nid, crit, idx);
|
||||
}
|
||||
{
|
||||
return X509V3_get_d2i(a->extensions, nid, crit, idx);
|
||||
}
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@@ -1,6 +1,7 @@
|
||||
/* crypto/ts/ts_verify_ctx.c */
|
||||
/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
|
||||
* project 2003.
|
||||
/*
|
||||
* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL project
|
||||
* 2003.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
|
||||
@@ -10,7 +11,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -61,99 +62,101 @@
|
||||
#include <openssl/ts.h>
|
||||
|
||||
TS_VERIFY_CTX *TS_VERIFY_CTX_new(void)
|
||||
{
|
||||
TS_VERIFY_CTX *ctx =
|
||||
(TS_VERIFY_CTX *) OPENSSL_malloc(sizeof(TS_VERIFY_CTX));
|
||||
if (ctx)
|
||||
memset(ctx, 0, sizeof(TS_VERIFY_CTX));
|
||||
else
|
||||
TSerr(TS_F_TS_VERIFY_CTX_NEW, ERR_R_MALLOC_FAILURE);
|
||||
return ctx;
|
||||
}
|
||||
{
|
||||
TS_VERIFY_CTX *ctx =
|
||||
(TS_VERIFY_CTX *)OPENSSL_malloc(sizeof(TS_VERIFY_CTX));
|
||||
if (ctx)
|
||||
memset(ctx, 0, sizeof(TS_VERIFY_CTX));
|
||||
else
|
||||
TSerr(TS_F_TS_VERIFY_CTX_NEW, ERR_R_MALLOC_FAILURE);
|
||||
return ctx;
|
||||
}
|
||||
|
||||
void TS_VERIFY_CTX_init(TS_VERIFY_CTX *ctx)
|
||||
{
|
||||
OPENSSL_assert(ctx != NULL);
|
||||
memset(ctx, 0, sizeof(TS_VERIFY_CTX));
|
||||
}
|
||||
{
|
||||
OPENSSL_assert(ctx != NULL);
|
||||
memset(ctx, 0, sizeof(TS_VERIFY_CTX));
|
||||
}
|
||||
|
||||
void TS_VERIFY_CTX_free(TS_VERIFY_CTX *ctx)
|
||||
{
|
||||
if (!ctx) return;
|
||||
{
|
||||
if (!ctx)
|
||||
return;
|
||||
|
||||
TS_VERIFY_CTX_cleanup(ctx);
|
||||
OPENSSL_free(ctx);
|
||||
}
|
||||
TS_VERIFY_CTX_cleanup(ctx);
|
||||
OPENSSL_free(ctx);
|
||||
}
|
||||
|
||||
void TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx)
|
||||
{
|
||||
if (!ctx) return;
|
||||
{
|
||||
if (!ctx)
|
||||
return;
|
||||
|
||||
X509_STORE_free(ctx->store);
|
||||
sk_X509_pop_free(ctx->certs, X509_free);
|
||||
X509_STORE_free(ctx->store);
|
||||
sk_X509_pop_free(ctx->certs, X509_free);
|
||||
|
||||
ASN1_OBJECT_free(ctx->policy);
|
||||
ASN1_OBJECT_free(ctx->policy);
|
||||
|
||||
X509_ALGOR_free(ctx->md_alg);
|
||||
OPENSSL_free(ctx->imprint);
|
||||
|
||||
BIO_free_all(ctx->data);
|
||||
X509_ALGOR_free(ctx->md_alg);
|
||||
OPENSSL_free(ctx->imprint);
|
||||
|
||||
ASN1_INTEGER_free(ctx->nonce);
|
||||
BIO_free_all(ctx->data);
|
||||
|
||||
GENERAL_NAME_free(ctx->tsa_name);
|
||||
ASN1_INTEGER_free(ctx->nonce);
|
||||
|
||||
TS_VERIFY_CTX_init(ctx);
|
||||
}
|
||||
GENERAL_NAME_free(ctx->tsa_name);
|
||||
|
||||
TS_VERIFY_CTX_init(ctx);
|
||||
}
|
||||
|
||||
TS_VERIFY_CTX *TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx)
|
||||
{
|
||||
TS_VERIFY_CTX *ret = ctx;
|
||||
ASN1_OBJECT *policy;
|
||||
TS_MSG_IMPRINT *imprint;
|
||||
X509_ALGOR *md_alg;
|
||||
ASN1_OCTET_STRING *msg;
|
||||
const ASN1_INTEGER *nonce;
|
||||
{
|
||||
TS_VERIFY_CTX *ret = ctx;
|
||||
ASN1_OBJECT *policy;
|
||||
TS_MSG_IMPRINT *imprint;
|
||||
X509_ALGOR *md_alg;
|
||||
ASN1_OCTET_STRING *msg;
|
||||
const ASN1_INTEGER *nonce;
|
||||
|
||||
OPENSSL_assert(req != NULL);
|
||||
if (ret)
|
||||
TS_VERIFY_CTX_cleanup(ret);
|
||||
else
|
||||
if (!(ret = TS_VERIFY_CTX_new())) return NULL;
|
||||
OPENSSL_assert(req != NULL);
|
||||
if (ret)
|
||||
TS_VERIFY_CTX_cleanup(ret);
|
||||
else if (!(ret = TS_VERIFY_CTX_new()))
|
||||
return NULL;
|
||||
|
||||
/* Setting flags. */
|
||||
ret->flags = TS_VFY_ALL_IMPRINT & ~(TS_VFY_TSA_NAME | TS_VFY_SIGNATURE);
|
||||
/* Setting flags. */
|
||||
ret->flags = TS_VFY_ALL_IMPRINT & ~(TS_VFY_TSA_NAME | TS_VFY_SIGNATURE);
|
||||
|
||||
/* Setting policy. */
|
||||
if ((policy = TS_REQ_get_policy_id(req)) != NULL)
|
||||
{
|
||||
if (!(ret->policy = OBJ_dup(policy))) goto err;
|
||||
}
|
||||
else
|
||||
ret->flags &= ~TS_VFY_POLICY;
|
||||
/* Setting policy. */
|
||||
if ((policy = TS_REQ_get_policy_id(req)) != NULL) {
|
||||
if (!(ret->policy = OBJ_dup(policy)))
|
||||
goto err;
|
||||
} else
|
||||
ret->flags &= ~TS_VFY_POLICY;
|
||||
|
||||
/* Setting md_alg, imprint and imprint_len. */
|
||||
imprint = TS_REQ_get_msg_imprint(req);
|
||||
md_alg = TS_MSG_IMPRINT_get_algo(imprint);
|
||||
if (!(ret->md_alg = X509_ALGOR_dup(md_alg))) goto err;
|
||||
msg = TS_MSG_IMPRINT_get_msg(imprint);
|
||||
ret->imprint_len = ASN1_STRING_length(msg);
|
||||
if (!(ret->imprint = OPENSSL_malloc(ret->imprint_len))) goto err;
|
||||
memcpy(ret->imprint, ASN1_STRING_data(msg), ret->imprint_len);
|
||||
/* Setting md_alg, imprint and imprint_len. */
|
||||
imprint = TS_REQ_get_msg_imprint(req);
|
||||
md_alg = TS_MSG_IMPRINT_get_algo(imprint);
|
||||
if (!(ret->md_alg = X509_ALGOR_dup(md_alg)))
|
||||
goto err;
|
||||
msg = TS_MSG_IMPRINT_get_msg(imprint);
|
||||
ret->imprint_len = ASN1_STRING_length(msg);
|
||||
if (!(ret->imprint = OPENSSL_malloc(ret->imprint_len)))
|
||||
goto err;
|
||||
memcpy(ret->imprint, ASN1_STRING_data(msg), ret->imprint_len);
|
||||
|
||||
/* Setting nonce. */
|
||||
if ((nonce = TS_REQ_get_nonce(req)) != NULL)
|
||||
{
|
||||
if (!(ret->nonce = ASN1_INTEGER_dup(nonce))) goto err;
|
||||
}
|
||||
else
|
||||
ret->flags &= ~TS_VFY_NONCE;
|
||||
/* Setting nonce. */
|
||||
if ((nonce = TS_REQ_get_nonce(req)) != NULL) {
|
||||
if (!(ret->nonce = ASN1_INTEGER_dup(nonce)))
|
||||
goto err;
|
||||
} else
|
||||
ret->flags &= ~TS_VFY_NONCE;
|
||||
|
||||
return ret;
|
||||
return ret;
|
||||
err:
|
||||
if (ctx)
|
||||
TS_VERIFY_CTX_cleanup(ctx);
|
||||
else
|
||||
TS_VERIFY_CTX_free(ret);
|
||||
return NULL;
|
||||
}
|
||||
if (ctx)
|
||||
TS_VERIFY_CTX_cleanup(ctx);
|
||||
else
|
||||
TS_VERIFY_CTX_free(ret);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user