summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2014-05-15 15:55:56 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2014-05-15 15:55:56 +0000
commitcba3bed5eb64142c2a945be867c6196b2a6a6cac (patch)
tree84fdc2f327848164fafacb61cde4b7ff284d2566
parentb54fa9962fdd1377f54b752c284af20e113dc33c (diff)
More KNF.
-rw-r--r--lib/libssl/src/crypto/evp/e_des.c6
-rw-r--r--lib/libssl/src/crypto/evp/e_des3.c2
-rw-r--r--lib/libssl/src/crypto/evp/encode.c4
-rw-r--r--lib/libssl/src/crypto/evp/p_sign.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/libssl/src/crypto/evp/e_des.c b/lib/libssl/src/crypto/evp/e_des.c
index ac46ba6a966..8dbc59c4c1a 100644
--- a/lib/libssl/src/crypto/evp/e_des.c
+++ b/lib/libssl/src/crypto/evp/e_des.c
@@ -175,7 +175,7 @@ des_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
out += EVP_MAXCHUNK;
}
if (inl)
- DES_cfb_encrypt(in, out, 8,(long)inl, ctx->cipher_data,
+ DES_cfb_encrypt(in, out, 8, (long)inl, ctx->cipher_data,
(DES_cblock *)ctx->iv, ctx->encrypt);
return 1;
}
@@ -186,12 +186,12 @@ BLOCK_CIPHER_defs(des, DES_key_schedule, NID_des, 8, 8, 8, 64,
EVP_CIPHER_get_asn1_iv,
des_ctrl)
-BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8,8, 1,
+BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8, 8, 1,
EVP_CIPH_RAND_KEY, des_init_key, NULL,
EVP_CIPHER_set_asn1_iv,
EVP_CIPHER_get_asn1_iv, des_ctrl)
-BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8,8, 8,
+BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8, 8, 8,
EVP_CIPH_RAND_KEY, des_init_key, NULL,
EVP_CIPHER_set_asn1_iv,
EVP_CIPHER_get_asn1_iv, des_ctrl)
diff --git a/lib/libssl/src/crypto/evp/e_des3.c b/lib/libssl/src/crypto/evp/e_des3.c
index a6093c2ddb7..92148cb33fd 100644
--- a/lib/libssl/src/crypto/evp/e_des3.c
+++ b/lib/libssl/src/crypto/evp/e_des3.c
@@ -251,7 +251,7 @@ des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) ||
DES_set_key_checked(&deskey[1], &data(ctx)->ks2) ||
DES_set_key_checked(&deskey[2], &data(ctx)->ks3))
- return 0;
+ return 0;
#else
DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);
DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2);
diff --git a/lib/libssl/src/crypto/evp/encode.c b/lib/libssl/src/crypto/evp/encode.c
index 2268b8d2f27..4307802f56a 100644
--- a/lib/libssl/src/crypto/evp/encode.c
+++ b/lib/libssl/src/crypto/evp/encode.c
@@ -224,7 +224,7 @@ int
EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
const unsigned char *in, int inl)
{
- int seof = -1, eof = 0, rv = -1, ret = 0, i,v, tmp, n, ln, exp_nl;
+ int seof = -1, eof = 0, rv = -1, ret = 0, i, v, tmp, n, ln, exp_nl;
unsigned char *d;
n = ctx->num;
@@ -360,7 +360,7 @@ end:
int
EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n)
{
- int i, ret = 0, a,b, c, d;
+ int i, ret = 0, a, b, c, d;
unsigned long l;
/* trim white space from the start of the line. */
diff --git a/lib/libssl/src/crypto/evp/p_sign.c b/lib/libssl/src/crypto/evp/p_sign.c
index b064ec5fb5f..9daaf1cecfc 100644
--- a/lib/libssl/src/crypto/evp/p_sign.c
+++ b/lib/libssl/src/crypto/evp/p_sign.c
@@ -132,6 +132,6 @@ err:
EVPerr(EVP_F_EVP_SIGNFINAL, EVP_R_NO_SIGN_FUNCTION_CONFIGURED);
return (0);
}
- return(ctx->digest->sign(ctx->digest->type, m,m_len, sigret, siglen,
+ return(ctx->digest->sign(ctx->digest->type, m, m_len, sigret, siglen,
pkey->pkey.ptr));
}