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/x509v3 | |
parent | 43257b9f51de749262258668c77c2f0f99d7a15b (diff) |
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/x509v3')
-rw-r--r-- | crypto/x509v3/pcy_tree.c | 3 | ||||
-rw-r--r-- | crypto/x509v3/v3_ncons.c | 4 | ||||
-rw-r--r-- | crypto/x509v3/v3_purp.c | 6 | ||||
-rw-r--r-- | crypto/x509v3/v3_scts.c | 6 | ||||
-rw-r--r-- | crypto/x509v3/v3nametest.c | 2 |
5 files changed, 13 insertions, 8 deletions
diff --git a/crypto/x509v3/pcy_tree.c b/crypto/x509v3/pcy_tree.c index bb9777348f..2d8bb524a9 100644 --- a/crypto/x509v3/pcy_tree.c +++ b/crypto/x509v3/pcy_tree.c @@ -756,7 +756,8 @@ void X509_policy_tree_free(X509_POLICY_TREE *tree) } -/* Application policy checking function. +/*- + * Application policy checking function. * Return codes: * 0 Internal Error. * 1 Successful. diff --git a/crypto/x509v3/v3_ncons.c b/crypto/x509v3/v3_ncons.c index 3b0f1bd1bd..ddd61a5f76 100644 --- a/crypto/x509v3/v3_ncons.c +++ b/crypto/x509v3/v3_ncons.c @@ -224,7 +224,8 @@ static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip) return 1; } -/* Check a certificate conforms to a specified set of constraints. +/*- + * Check a certificate conforms to a specified set of constraints. * Return values: * X509_V_OK: All constraints obeyed. * X509_V_ERR_PERMITTED_VIOLATION: Permitted subtree violation. @@ -233,7 +234,6 @@ static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip) * X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE: Unsupported constraint type. * X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX: bad unsupported constraint syntax. * X509_V_ERR_UNSUPPORTED_NAME_SYNTAX: bad or unsupported syntax of name - */ int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc) diff --git a/crypto/x509v3/v3_purp.c b/crypto/x509v3/v3_purp.c index 5f931db3b9..8e0a685d19 100644 --- a/crypto/x509v3/v3_purp.c +++ b/crypto/x509v3/v3_purp.c @@ -497,7 +497,8 @@ static void x509v3_cache_extensions(X509 *x) x->ex_flags |= EXFLAG_SET; } -/* CA checks common to all purposes +/*- + * CA checks common to all purposes * return codes: * 0 not a CA * 1 is a CA @@ -700,7 +701,8 @@ static int no_check(const X509_PURPOSE *xp, const X509 *x, int ca) return 1; } -/* Various checks to see if one certificate issued the second. +/*- + * Various checks to see if one certificate issued the second. * This can be used to prune a set of possible issuer certificates * which have been looked up using some simple method such as by * subject name. diff --git a/crypto/x509v3/v3_scts.c b/crypto/x509v3/v3_scts.c index 3bf1579310..5367271d37 100644 --- a/crypto/x509v3/v3_scts.c +++ b/crypto/x509v3/v3_scts.c @@ -226,7 +226,8 @@ static STACK_OF(SCT) *d2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp, sct->version = *p2++; if (sct->version == 0) /* SCT v1 */ { - /* Fixed-length header: + /*- + * Fixed-length header: * struct { * (1 byte) Version sct_version; * (32 bytes) LogID id; @@ -251,7 +252,8 @@ static STACK_OF(SCT) *d2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp, p2 += fieldlen; sctlen -= fieldlen; - /* digitally-signed struct header: + /*- + * digitally-signed struct header: * (1 byte) Hash algorithm * (1 byte) Signature algorithm * (2 bytes + ?) Signature diff --git a/crypto/x509v3/v3nametest.c b/crypto/x509v3/v3nametest.c index dd5f9f8c42..fbf82d0cee 100644 --- a/crypto/x509v3/v3nametest.c +++ b/crypto/x509v3/v3nametest.c @@ -91,7 +91,7 @@ static int set_cn(X509 *crt, ...) return ret; } -/* +/*- int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc); X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid, int crit, ASN1_OCTET_STRING *data); |