aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/smbencrypt.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-07-23 13:14:28 -0400
committerSteve French <smfrench@gmail.com>2012-07-23 17:36:26 -0400
commitac3aa2f8ae29c186c4742d15e39712af417c6d68 (patch)
treec2cc038cf4ad883d0f4085c5430db14af27e1328 /fs/cifs/smbencrypt.c
parent00401ff780c58b9dabffef668386c206efc71c7c (diff)
cifs: remove extraneous newlines from cERROR and cFYI calls
Those macros add a newline on their own, so there's not any need to embed one in the message itself. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/smbencrypt.c')
-rw-r--r--fs/cifs/smbencrypt.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c
index d5cd9aa7eacc..a0a58fbe2c10 100644
--- a/fs/cifs/smbencrypt.c
+++ b/fs/cifs/smbencrypt.c
@@ -78,7 +78,7 @@ smbhash(unsigned char *out, const unsigned char *in, unsigned char *key)
78 tfm_des = crypto_alloc_blkcipher("ecb(des)", 0, CRYPTO_ALG_ASYNC); 78 tfm_des = crypto_alloc_blkcipher("ecb(des)", 0, CRYPTO_ALG_ASYNC);
79 if (IS_ERR(tfm_des)) { 79 if (IS_ERR(tfm_des)) {
80 rc = PTR_ERR(tfm_des); 80 rc = PTR_ERR(tfm_des);
81 cERROR(1, "could not allocate des crypto API\n"); 81 cERROR(1, "could not allocate des crypto API");
82 goto smbhash_err; 82 goto smbhash_err;
83 } 83 }
84 84
@@ -91,7 +91,7 @@ smbhash(unsigned char *out, const unsigned char *in, unsigned char *key)
91 91
92 rc = crypto_blkcipher_encrypt(&desc, &sgout, &sgin, 8); 92 rc = crypto_blkcipher_encrypt(&desc, &sgout, &sgin, 8);
93 if (rc) 93 if (rc)
94 cERROR(1, "could not encrypt crypt key rc: %d\n", rc); 94 cERROR(1, "could not encrypt crypt key rc: %d", rc);
95 95
96 crypto_free_blkcipher(tfm_des); 96 crypto_free_blkcipher(tfm_des);
97smbhash_err: 97smbhash_err:
@@ -139,14 +139,14 @@ mdfour(unsigned char *md4_hash, unsigned char *link_str, int link_len)
139 md4 = crypto_alloc_shash("md4", 0, 0); 139 md4 = crypto_alloc_shash("md4", 0, 0);
140 if (IS_ERR(md4)) { 140 if (IS_ERR(md4)) {
141 rc = PTR_ERR(md4); 141 rc = PTR_ERR(md4);
142 cERROR(1, "%s: Crypto md4 allocation error %d\n", __func__, rc); 142 cERROR(1, "%s: Crypto md4 allocation error %d", __func__, rc);
143 return rc; 143 return rc;
144 } 144 }
145 size = sizeof(struct shash_desc) + crypto_shash_descsize(md4); 145 size = sizeof(struct shash_desc) + crypto_shash_descsize(md4);
146 sdescmd4 = kmalloc(size, GFP_KERNEL); 146 sdescmd4 = kmalloc(size, GFP_KERNEL);
147 if (!sdescmd4) { 147 if (!sdescmd4) {
148 rc = -ENOMEM; 148 rc = -ENOMEM;
149 cERROR(1, "%s: Memory allocation failure\n", __func__); 149 cERROR(1, "%s: Memory allocation failure", __func__);
150 goto mdfour_err; 150 goto mdfour_err;
151 } 151 }
152 sdescmd4->shash.tfm = md4; 152 sdescmd4->shash.tfm = md4;
@@ -154,17 +154,17 @@ mdfour(unsigned char *md4_hash, unsigned char *link_str, int link_len)
154 154
155 rc = crypto_shash_init(&sdescmd4->shash); 155 rc = crypto_shash_init(&sdescmd4->shash);
156 if (rc) { 156 if (rc) {
157 cERROR(1, "%s: Could not init md4 shash\n", __func__); 157 cERROR(1, "%s: Could not init md4 shash", __func__);
158 goto mdfour_err; 158 goto mdfour_err;
159 } 159 }
160 rc = crypto_shash_update(&sdescmd4->shash, link_str, link_len); 160 rc = crypto_shash_update(&sdescmd4->shash, link_str, link_len);
161 if (rc) { 161 if (rc) {
162 cERROR(1, "%s: Could not update with link_str\n", __func__); 162 cERROR(1, "%s: Could not update with link_str", __func__);
163 goto mdfour_err; 163 goto mdfour_err;
164 } 164 }
165 rc = crypto_shash_final(&sdescmd4->shash, md4_hash); 165 rc = crypto_shash_final(&sdescmd4->shash, md4_hash);
166 if (rc) 166 if (rc)
167 cERROR(1, "%s: Could not genereate md4 hash\n", __func__); 167 cERROR(1, "%s: Could not genereate md4 hash", __func__);
168 168
169mdfour_err: 169mdfour_err:
170 crypto_free_shash(md4); 170 crypto_free_shash(md4);