diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-21 09:33:22 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:26:15 +0000 |
| commit | 4ce632fb45f4278f7e23fb545b8e380333e17905 (patch) | |
| tree | 40a340e2c98ad689cb7db209a3dec0a731fe005f | |
| parent | 7b1ac23412970d001348d684009310c0d12e8ffd (diff) | |
More indent fixes for STACK_OF
Conflicts:
ssl/s3_lib.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
| -rw-r--r-- | apps/cms.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_lu.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_vfy.h | 2 | ||||
| -rw-r--r-- | crypto/x509v3/v3_utl.c | 2 | ||||
| -rw-r--r-- | crypto/x509v3/x509v3.h | 2 | ||||
| -rw-r--r-- | ssl/s3_lib.c | 8 |
6 files changed, 9 insertions, 9 deletions
diff --git a/apps/cms.c b/apps/cms.c index d15e203f9c..9688770b41 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -104,7 +104,7 @@ typedef struct cms_key_param_st cms_key_param; struct cms_key_param_st { int idx; - STACK_OF(OPENSSL_STRING)*param; + STACK_OF(OPENSSL_STRING) *param; cms_key_param *next; }; diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c index 092e06c0b8..2febcb6142 100644 --- a/crypto/x509/x509_lu.c +++ b/crypto/x509/x509_lu.c @@ -727,7 +727,7 @@ void X509_STORE_set_verify_cb(X509_STORE *ctx, } void X509_STORE_set_lookup_crls_cb(X509_STORE *ctx, - STACK_OF(X509_CRL)* (*cb)(X509_STORE_CTX *ctx, X509_NAME *nm)) + STACK_OF(X509_CRL) *(*cb)(X509_STORE_CTX *ctx, X509_NAME *nm)) { ctx->lookup_crls = cb; } diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h index e52b5e0aa7..f1546c525a 100644 --- a/crypto/x509/x509_vfy.h +++ b/crypto/x509/x509_vfy.h @@ -449,7 +449,7 @@ void X509_STORE_set_verify_cb(X509_STORE *ctx, int (*verify_cb)(int, X509_STORE_CTX *)); void X509_STORE_set_lookup_crls_cb(X509_STORE *ctx, - STACK_OF(X509_CRL)* (*cb)(X509_STORE_CTX *ctx, X509_NAME *nm)); + STACK_OF(X509_CRL) *(*cb)(X509_STORE_CTX *ctx, X509_NAME *nm)); X509_STORE_CTX *X509_STORE_CTX_new(void); diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c index c9a6e79838..01c07f4836 100644 --- a/crypto/x509v3/v3_utl.c +++ b/crypto/x509v3/v3_utl.c @@ -1274,7 +1274,7 @@ static int ipv6_hex(unsigned char *out, const char *in, int inlen) } -int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk, +int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk, unsigned long chtype) { CONF_VALUE *v; diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index 6556366277..1723bb37fd 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -737,7 +737,7 @@ int X509_check_ip_asc(X509 *x, const char *ipasc, unsigned int flags); ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc); ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc); int a2i_ipadd(unsigned char *ipout, const char *ipasc); -int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk, +int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk, unsigned long chtype); void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent); diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 82fc5a8487..f59cc39d5e 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3403,10 +3403,10 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) case SSL_CTRL_CHAIN: if (larg) return ssl_cert_set1_chain(s->cert, - (STACK_OF (X509) *)parg); + (STACK_OF(X509) *)parg); else return ssl_cert_set0_chain(s->cert, - (STACK_OF (X509) *)parg); + (STACK_OF(X509) *)parg); case SSL_CTRL_CHAIN_CERT: if (larg) @@ -3961,10 +3961,10 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) case SSL_CTRL_CHAIN: if (larg) return ssl_cert_set1_chain(ctx->cert, - (STACK_OF (X509) *)parg); + (STACK_OF(X509) *)parg); else return ssl_cert_set0_chain(ctx->cert, - (STACK_OF (X509) *)parg); + (STACK_OF(X509) *)parg); case SSL_CTRL_CHAIN_CERT: if (larg) |