wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some extra or missing whitespaces...

Browse source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1618)
This commit is contained in:
FdaSilvaYY 2016-08-24 00:17:31 +02:00 committed by Matt Caswell
parent ec2a0e6065
commit 28b86f313b
12 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/apps.h
View file

@ -294,7 +294,7 @@ typedef struct options_st {
/*
* value type: - no value (also the value zero), n number, p positive
* number, u unsigned, l long, s string, < input file, > output file,
* f any format, F der/pem format , E der/pem/engine format identifier.
* f any format, F der/pem format, E der/pem/engine format identifier.
* l, n and u include zero; p does not.
*/
int valtype;

2
apps/ec.c
View file

@ -185,7 +185,7 @@ int ec_main(int argc, char **argv)
} else if (informat == FORMAT_ENGINE) {
EVP_PKEY *pkey;
if (pubin)
pkey = load_pubkey(infile, informat , 1, passin, e, "Public Key");
pkey = load_pubkey(infile, informat, 1, passin, e, "Public Key");
else
pkey = load_key(infile, informat, 1, passin, e, "Private Key");
if (pkey != NULL) {

2
apps/prime.c
View file

@ -106,7 +106,7 @@ int prime_main(int argc, char **argv)
else
r = BN_dec2bn(&bn, argv[0]);
if(!r) {
if (!r) {
BIO_printf(bio_err, "Failed to process value (%s)\n", argv[0]);
goto end;
}

2
crypto/blake2/blake2s.c
View file

@ -219,7 +219,7 @@ int BLAKE2s_Update(BLAKE2S_CTX *c, const void *data, size_t datalen)
in += fill;
datalen -= fill;
}
if (datalen > BLAKE2S_BLOCKBYTES) {
if (datalen > BLAKE2S_BLOCKBYTES) {
size_t stashlen = datalen % BLAKE2S_BLOCKBYTES;
/*
* If |datalen| is a multiple of the blocksize, stash

2
crypto/dsa/dsa_meth.c
View file

@ -132,7 +132,7 @@ int DSA_meth_set_sign_setup(DSA_METHOD *dsam,
}
int (*DSA_meth_get_verify(const DSA_METHOD *dsam))
(const unsigned char *, int , DSA_SIG *, DSA *)
(const unsigned char *, int, DSA_SIG *, DSA *)
{
return dsam->dsa_do_verify;
}

5
doc/man3/EVP_DigestInit.pod
View file

@ -210,14 +210,13 @@ digest name passed on the command line.
unsigned char md_value[EVP_MAX_MD_SIZE];
int md_len, i;
if(!argv[1]) {
if (!argv[1]) {
printf("Usage: mdtest digestname\n");
exit(1);
}
md = EVP_get_digestbyname(argv[1]);
if(!md) {
if (md == NULL) {
printf("Unknown message digest %s\n", argv[1]);
exit(1);
}

6
doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod
View file

@ -155,17 +155,17 @@ Reference Implementation:
} else { /* retrieve session */
key = findkey(name);
if (!key || key->expire < now() ) {
if (!key || key->expire < now() ) {
return 0;
}
HMAC_Init_ex(&hctx, key->hmac_key, 16, EVP_sha256(), NULL);
EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->aes_key, iv );
if (key->expire < ( now() - RENEW_TIME ) ) {
if (key->expire < ( now() - RENEW_TIME ) )
/* return 2 - this session will get a new ticket even though the current is still valid */
return 2;
}
return 1;
}

2
include/openssl/dsa.h
View file

@ -199,7 +199,7 @@ int (*DSA_meth_get_sign_setup(const DSA_METHOD *dsam))
int DSA_meth_set_sign_setup(DSA_METHOD *dsam,
int (*sign_setup) (DSA *, BN_CTX *, BIGNUM **, BIGNUM **));
int (*DSA_meth_get_verify(const DSA_METHOD *dsam))
(const unsigned char *, int , DSA_SIG *, DSA *);
(const unsigned char *, int, DSA_SIG *, DSA *);
int DSA_meth_set_verify(DSA_METHOD *dsam,
int (*verify) (const unsigned char *, int, DSA_SIG *, DSA *));
int (*DSA_meth_get_mod_exp(const DSA_METHOD *dsam))

2
test/asynciotest.c
View file

@ -205,7 +205,7 @@ static int async_write(BIO *bio, const char *in, int inl)
/* Write any data we have left after fragmenting */
ret = 0;
if ((int)written < inl) {
ret = BIO_write(next, in + written , inl - written);
ret = BIO_write(next, in + written, inl - written);
}
if (ret <= 0 && BIO_should_write(next))

2
test/handshake_helper.c
View file

@ -837,7 +837,7 @@ static char *dup_str(const unsigned char *in, size_t len)
{
char *ret;
if(len == 0)
if (len == 0)
return NULL;
/* Assert that the string does not contain NUL-bytes. */

4
test/ssltestlib.c
View file

@ -155,7 +155,7 @@ static void dump_data(const char *data, int len)
printf("*** Message Fragment len: %d\n", fraglen);
if (fragoff + fraglen > msglen)
printf("***---- HANDSHAKE MESSAGE FRAGMENT INVALID ----\n");
else if(reclen < fraglen)
else if (reclen < fraglen)
printf("**---- HANDSHAKE MESSAGE FRAGMENT TRUNCATED ----\n");
else
printf("**---- END OF HANDSHAKE MESSAGE FRAGMENT ----\n");
@ -442,7 +442,7 @@ int mempacket_test_inject(BIO *bio, const char *in, int inl, int pktnum,
else
return inl;
} while(1);
} else if(looppkt->num == thispkt->num) {
} else if (looppkt->num == thispkt->num) {
if (!ctx->noinject) {
/* We injected two packets with the same packet number! */
return -1;

4
test/verify_extra_test.c
View file

@ -102,7 +102,7 @@ static int test_alt_chains_cert_forgery(const char *roots_f,
lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
if (lookup == NULL)
goto err;
if(!X509_LOOKUP_load_file(lookup, roots_f, X509_FILETYPE_PEM))
if (!X509_LOOKUP_load_file(lookup, roots_f, X509_FILETYPE_PEM))
goto err;
untrusted = load_certs_from_file(untrusted_f);
@ -110,7 +110,7 @@ static int test_alt_chains_cert_forgery(const char *roots_f,
if ((bio = BIO_new_file(bad_f, "r")) == NULL)
goto err;
if((x = PEM_read_bio_X509(bio, NULL, 0, NULL)) == NULL)
if ((x = PEM_read_bio_X509(bio, NULL, 0, NULL)) == NULL)
goto err;
sctx = X509_STORE_CTX_new();