diff options
author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-05-03 22:40:33 +0200 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-05-09 09:09:55 +0100 |
commit | dccd20d1b55d15afdc80ad987ff37023d323dc42 (patch) | |
tree | 58c7f099bf0aee13969d18c9af3964909bfefeb6 /crypto | |
parent | e0d32e98f00cfd39977593ae1bc6cfd2ab6bbb0e (diff) |
fix tab-space mixed indentation
No code change
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/blake2/blake2b.c | 4 | ||||
-rw-r--r-- | crypto/blake2/blake2s.c | 4 | ||||
-rw-r--r-- | crypto/dso/dso_vms.c | 2 | ||||
-rw-r--r-- | crypto/ec/ecp_nistz256.c | 6 | ||||
-rw-r--r-- | crypto/evp/p5_crpt2.c | 2 | ||||
-rw-r--r-- | crypto/modes/ocb128.c | 2 | ||||
-rw-r--r-- | crypto/objects/o_names.c | 2 | ||||
-rw-r--r-- | crypto/poly1305/poly1305.c | 18 | ||||
-rw-r--r-- | crypto/ppccap.c | 2 | ||||
-rw-r--r-- | crypto/x509/x509_vfy.c | 6 |
10 files changed, 24 insertions, 24 deletions
diff --git a/crypto/blake2/blake2b.c b/crypto/blake2/blake2b.c index bc375474b9..0edca5ded9 100644 --- a/crypto/blake2/blake2b.c +++ b/crypto/blake2/blake2b.c @@ -229,8 +229,8 @@ int BLAKE2b_Update(BLAKE2B_CTX *c, const void *data, size_t datalen) if (datalen > BLAKE2B_BLOCKBYTES) { size_t stashlen = datalen % BLAKE2B_BLOCKBYTES; /* - * If |datalen| is a multiple of the blocksize, stash - * last complete block, it can be final one... + * If |datalen| is a multiple of the blocksize, stash + * last complete block, it can be final one... */ stashlen = stashlen ? stashlen : BLAKE2B_BLOCKBYTES; datalen -= stashlen; diff --git a/crypto/blake2/blake2s.c b/crypto/blake2/blake2s.c index dc8fae4eb9..a5e6da1e26 100644 --- a/crypto/blake2/blake2s.c +++ b/crypto/blake2/blake2s.c @@ -223,8 +223,8 @@ int BLAKE2s_Update(BLAKE2S_CTX *c, const void *data, size_t datalen) if (datalen > BLAKE2S_BLOCKBYTES) { size_t stashlen = datalen % BLAKE2S_BLOCKBYTES; /* - * If |datalen| is a multiple of the blocksize, stash - * last complete block, it can be final one... + * If |datalen| is a multiple of the blocksize, stash + * last complete block, it can be final one... */ stashlen = stashlen ? stashlen : BLAKE2S_BLOCKBYTES; datalen -= stashlen; diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c index 654e766764..8678f487ff 100644 --- a/crypto/dso/dso_vms.c +++ b/crypto/dso/dso_vms.c @@ -150,7 +150,7 @@ static int vms_load(DSO *dso) # endif /* __INITIAL_POINTER_SIZE == 64 */ const char *sp1, *sp2; /* Search result */ - const char *ext = NULL; /* possible extension to add */ + const char *ext = NULL; /* possible extension to add */ if (filename == NULL) { DSOerr(DSO_F_VMS_LOAD, DSO_R_NO_FILENAME); diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c index f2ef9be7f8..f4712bda06 100644 --- a/crypto/ec/ecp_nistz256.c +++ b/crypto/ec/ecp_nistz256.c @@ -625,9 +625,9 @@ __owur static int ecp_nistz256_windowed_mul(const EC_GROUP *group, } /* - * row[0] is implicitly (0,0,0) (the point at infinity), therefore it - * is not stored. All other values are actually stored with an offset - * of -1 in table. + * row[0] is implicitly (0,0,0) (the point at infinity), therefore it + * is not stored. All other values are actually stored with an offset + * of -1 in table. */ ecp_nistz256_scatter_w5 (row, &temp[0], 1); diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index 76dcf02ad1..799cb90e50 100644 --- a/crypto/evp/p5_crpt2.c +++ b/crypto/evp/p5_crpt2.c @@ -213,7 +213,7 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, /* See if we recognise the key derivation function */ if (!EVP_PBE_find(EVP_PBE_TYPE_KDF, OBJ_obj2nid(pbe2->keyfunc->algorithm), - NULL, NULL, &kdf)) { + NULL, NULL, &kdf)) { EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN, EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION); goto err; diff --git a/crypto/modes/ocb128.c b/crypto/modes/ocb128.c index c3daf7cd6e..3c17aa5287 100644 --- a/crypto/modes/ocb128.c +++ b/crypto/modes/ocb128.c @@ -415,7 +415,7 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, /* C_i = Offset_i xor ENCIPHER(K, P_i xor Offset_i) */ inblock = - (OCB_BLOCK *)(in + ((i - ctx->blocks_processed - 1) * 16)); + (OCB_BLOCK *)(in + ((i - ctx->blocks_processed - 1) * 16)); ocb_block16_xor_misaligned(&ctx->offset, inblock, &tmp1); /* Checksum_i = Checksum_{i-1} xor P_i */ ocb_block16_xor_misaligned(&ctx->checksum, inblock, &ctx->checksum); diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index 5728806488..978cbeaedc 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -23,7 +23,7 @@ #if defined(OPENSSL_SYS_VMS_DECC) || defined(OPENSSL_SYS_UEFI) static int obj_strcmp(const char *a, const char *b) { - return strcmp(a, b); + return strcmp(a, b); } #else #define obj_strcmp strcmp diff --git a/crypto/poly1305/poly1305.c b/crypto/poly1305/poly1305.c index f553098ecf..a7c4a0824e 100644 --- a/crypto/poly1305/poly1305.c +++ b/crypto/poly1305/poly1305.c @@ -185,9 +185,9 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit) h0 = (u64)(d0 = (u128)h0 + U8TOU64(inp + 0)); h1 = (u64)(d1 = (u128)h1 + (d0 >> 64) + U8TOU64(inp + 8)); /* - * padbit can be zero only when original len was - * POLY1306_BLOCK_SIZE, but we don't check - */ + * padbit can be zero only when original len was + * POLY1306_BLOCK_SIZE, but we don't check + */ h2 += (u64)(d1 >> 64) + padbit; /* h *= r "%" p, where "%" stands for "partial remainder" */ @@ -195,7 +195,7 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit) ((u128)h1 * s1); d1 = ((u128)h0 * r1) + ((u128)h1 * r0) + - (h2 * s1); + (h2 * s1); h2 = (h2 * r0); /* last reduction step: */ @@ -1012,14 +1012,14 @@ int main() Poly1305_Init(&poly1305, key); for (i=0;i<100000;i++) - Poly1305_Update(&poly1305,buf,sizeof(buf)); + Poly1305_Update(&poly1305,buf,sizeof(buf)); - stopwatch = OPENSSL_rdtsc(); + stopwatch = OPENSSL_rdtsc(); for (i=0;i<10000;i++) - Poly1305_Update(&poly1305,buf,sizeof(buf)); - stopwatch = OPENSSL_rdtsc() - stopwatch; + Poly1305_Update(&poly1305,buf,sizeof(buf)); + stopwatch = OPENSSL_rdtsc() - stopwatch; - printf("%g\n",stopwatch/(double)(i*sizeof(buf))); + printf("%g\n",stopwatch/(double)(i*sizeof(buf))); stopwatch = OPENSSL_rdtsc(); for (i=0;i<10000;i++) { diff --git a/crypto/ppccap.c b/crypto/ppccap.c index 50c111ac1c..6a4f4a4c41 100644 --- a/crypto/ppccap.c +++ b/crypto/ppccap.c @@ -225,7 +225,7 @@ void OPENSSL_cpuid_setup(void) unsigned long hwcap = getauxval(HWCAP); if (hwcap & HWCAP_FPU) { - OPENSSL_ppccap_P |= PPC_FPU; + OPENSSL_ppccap_P |= PPC_FPU; if (sizeof(size_t) == 4) { /* In 32-bit case PPC_FPU64 is always fastest [if option] */ diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 6fc08c4a26..319ddc9325 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -2558,9 +2558,9 @@ static int dane_match(X509_STORE_CTX *ctx, X509 *cert, int depth) cmplen = i2dlen; if (md != NULL) { - cmpbuf = mdbuf; - if (!EVP_Digest(i2dbuf, i2dlen, cmpbuf, &cmplen, md, 0)) { - matched = -1; + cmpbuf = mdbuf; + if (!EVP_Digest(i2dbuf, i2dlen, cmpbuf, &cmplen, md, 0)) { + matched = -1; break; } } |