diff options
| author | Tim Hudson <tjh@openssl.org> | 2014-12-28 12:48:40 +1000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:23:04 +0000 |
| commit | 6977c7e2baf291278aee7632f1a68581b7c4d1f9 (patch) | |
| tree | ae6c4def1c5f7f4a3c4cb9bb7e63ec0ebf27b7f7 /crypto/ts/ts.h | |
| parent | 43257b9f51de749262258668c77c2f0f99d7a15b (diff) | |
| download | openssl-6977c7e2baf291278aee7632f1a68581b7c4d1f9.tar.gz | |
mark all block comments that need format preserving so that
indent will not alter them when reformatting comments
(cherry picked from commit 1d97c8435171a7af575f73c526d79e1ef0ee5960)
Conflicts:
crypto/bn/bn_lcl.h
crypto/bn/bn_prime.c
crypto/engine/eng_all.c
crypto/rc4/rc4_utl.c
crypto/sha/sha.h
ssl/kssl.c
ssl/t1_lib.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/ts/ts.h')
| -rw-r--r-- | crypto/ts/ts.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/crypto/ts/ts.h b/crypto/ts/ts.h index c2448e3c3b..b5fe7ae1b1 100644 --- a/crypto/ts/ts.h +++ b/crypto/ts/ts.h @@ -98,7 +98,7 @@ extern "C" { #include <openssl/x509.h> #include <openssl/x509v3.h> -/* +/*- MessageImprint ::= SEQUENCE { hashAlgorithm AlgorithmIdentifier, hashedMessage OCTET STRING } @@ -110,7 +110,7 @@ typedef struct TS_msg_imprint_st ASN1_OCTET_STRING *hashed_msg; } TS_MSG_IMPRINT; -/* +/*- TimeStampReq ::= SEQUENCE { version INTEGER { v1(1) }, messageImprint MessageImprint, @@ -132,7 +132,7 @@ typedef struct TS_req_st STACK_OF(X509_EXTENSION) *extensions; /* [0] OPTIONAL */ } TS_REQ; -/* +/*- Accuracy ::= SEQUENCE { seconds INTEGER OPTIONAL, millis [0] INTEGER (1..999) OPTIONAL, @@ -146,7 +146,7 @@ typedef struct TS_accuracy_st ASN1_INTEGER *micros; } TS_ACCURACY; -/* +/*- TSTInfo ::= SEQUENCE { version INTEGER { v1(1) }, policy TSAPolicyId, @@ -180,7 +180,7 @@ typedef struct TS_tst_info_st STACK_OF(X509_EXTENSION) *extensions; } TS_TST_INFO; -/* +/*- PKIStatusInfo ::= SEQUENCE { status PKIStatus, statusString PKIFreeText OPTIONAL, @@ -223,7 +223,7 @@ typedef struct TS_status_info_st DECLARE_STACK_OF(ASN1_UTF8STRING) DECLARE_ASN1_SET_OF(ASN1_UTF8STRING) -/* +/*- TimeStampResp ::= SEQUENCE { status PKIStatusInfo, timeStampToken TimeStampToken OPTIONAL } @@ -238,7 +238,7 @@ typedef struct TS_resp_st /* The structure below would belong to the ESS component. */ -/* +/*- IssuerSerial ::= SEQUENCE { issuer GeneralNames, serialNumber CertificateSerialNumber @@ -251,7 +251,7 @@ typedef struct ESS_issuer_serial ASN1_INTEGER *serial; } ESS_ISSUER_SERIAL; -/* +/*- ESSCertID ::= SEQUENCE { certHash Hash, issuerSerial IssuerSerial OPTIONAL @@ -267,7 +267,7 @@ typedef struct ESS_cert_id DECLARE_STACK_OF(ESS_CERT_ID) DECLARE_ASN1_SET_OF(ESS_CERT_ID) -/* +/*- SigningCertificate ::= SEQUENCE { certs SEQUENCE OF ESSCertID, policies SEQUENCE OF PolicyInformation OPTIONAL @@ -691,7 +691,7 @@ void TS_VERIFY_CTX_init(TS_VERIFY_CTX *ctx); void TS_VERIFY_CTX_free(TS_VERIFY_CTX *ctx); void TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx); -/* +/*- * If ctx is NULL, it allocates and returns a new object, otherwise * it returns ctx. It initialises all the members as follows: * flags = TS_VFY_ALL_IMPRINT & ~(TS_VFY_TSA_NAME | TS_VFY_SIGNATURE) |