generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More indent fixes for STACK_OF

Browse Source 
Conflicts:
	ssl/s3_lib.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell 2015-01-21 09:33:22 +00:00
parent 7b1ac23412
commit 4ce632fb45
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cms.c
View File

@ -104,7 +104,7 @@ typedef struct cms_key_param_st cms_key_param;
struct cms_key_param_st struct cms_key_param_st
{ {
int idx; int idx;
STACK_OF(OPENSSL_STRING)*param; STACK_OF(OPENSSL_STRING) *param;
cms_key_param *next; cms_key_param *next;
}; };

2
crypto/x509/x509_lu.c
View File

@ -727,7 +727,7 @@ void X509_STORE_set_verify_cb(X509_STORE *ctx,
} }
void X509_STORE_set_lookup_crls_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; ctx->lookup_crls = cb;
} }

2
crypto/x509/x509_vfy.h
View File

@ -449,7 +449,7 @@ void X509_STORE_set_verify_cb(X509_STORE *ctx,
int (*verify_cb)(int, X509_STORE_CTX *)); int (*verify_cb)(int, X509_STORE_CTX *));
void X509_STORE_set_lookup_crls_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));
X509_STORE_CTX *X509_STORE_CTX_new(void); X509_STORE_CTX *X509_STORE_CTX_new(void);

2
crypto/x509v3/v3_utl.c
View 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) unsigned long chtype)
{ {
CONF_VALUE *v; CONF_VALUE *v;

2
crypto/x509v3/x509v3.h
View 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(const char *ipasc);
ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc); ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);
int a2i_ipadd(unsigned char *ipout, 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); unsigned long chtype);
void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent); void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);

8
ssl/s3_lib.c
View File

@ -3403,10 +3403,10 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
case SSL_CTRL_CHAIN: case SSL_CTRL_CHAIN:
if (larg) if (larg)
return ssl_cert_set1_chain(s->cert, return ssl_cert_set1_chain(s->cert,
(STACK_OF (X509) *)parg); (STACK_OF(X509) *)parg);
else else
return ssl_cert_set0_chain(s->cert, return ssl_cert_set0_chain(s->cert,
(STACK_OF (X509) *)parg); (STACK_OF(X509) *)parg);
case SSL_CTRL_CHAIN_CERT: case SSL_CTRL_CHAIN_CERT:
if (larg) if (larg)
@ -3961,10 +3961,10 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
case SSL_CTRL_CHAIN: case SSL_CTRL_CHAIN:
if (larg) if (larg)
return ssl_cert_set1_chain(ctx->cert, return ssl_cert_set1_chain(ctx->cert,
(STACK_OF (X509) *)parg); (STACK_OF(X509) *)parg);
else else
return ssl_cert_set0_chain(ctx->cert, return ssl_cert_set0_chain(ctx->cert,
(STACK_OF (X509) *)parg); (STACK_OF(X509) *)parg);
case SSL_CTRL_CHAIN_CERT: case SSL_CTRL_CHAIN_CERT:
if (larg) if (larg)