More indent fixes for STACK_OF
authorMatt Caswell <matt@openssl.org>
Wed, 21 Jan 2015 09:33:22 +0000 (09:33 +0000)
committerMatt Caswell <matt@openssl.org>
Thu, 22 Jan 2015 09:26:15 +0000 (09:26 +0000)
Conflicts:
ssl/s3_lib.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
apps/cms.c
crypto/x509/x509_lu.c
crypto/x509/x509_vfy.h
crypto/x509v3/v3_utl.c
crypto/x509v3/x509v3.h
ssl/s3_lib.c

index d15e203f9cb4be67f68892b63266c3890b35cd6d..9688770b41853674a71682ef2c75c975b63cd057 100644 (file)
@@ -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;
        };
 
index 092e06c0b867c113b6e8a12f2dac75b7ce189255..2febcb61422af62be73597086a0ca94be5578754 100644 (file)
@@ -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;
        }
index e52b5e0aa71f02ad0167508038b4af723731aa56..f1546c525a9f1df103e06a9a7f37b4fd42a6e27a 100644 (file)
@@ -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);
 
index c9a6e79838c36f7528745883b20613ad9bf09da6..01c07f48364d8731b9d11c8de12361fbdbb91c67 100644 (file)
@@ -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;
index 6556366277c3606fc2e6974fbb830425606b764d..1723bb37fd8a5248d75d155984848841977736f3 100644 (file)
@@ -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);
index 82fc5a84878c81dd43c88276f70ea2c6e47c2fea..f59cc39d5eb86242f1b3ff88138c06c7eb3a21bb 100644 (file)
@@ -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)