summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2013-09-28 09:27:58 +0200
committerNiels Möller <nisse@lysator.liu.se>2013-09-28 09:29:09 +0200
commit89755c916c84f722f081b5d53e8472d963cfbfe4 (patch)
tree779501699921690f997164e05df5a7f38254c283
parent0e577b14c65f27de4e4734e79f86e43be9247780 (diff)
downloadnettle-89755c916c84f722f081b5d53e8472d963cfbfe4.tar.gz
Some whitespace and comment fixes.
-rw-r--r--gcm-aes.c1
-rw-r--r--macros.h10
-rw-r--r--sha256.c2
-rw-r--r--sha512.c2
4 files changed, 7 insertions, 8 deletions
diff --git a/gcm-aes.c b/gcm-aes.c
index db4e968b..f5f54bc4 100644
--- a/gcm-aes.c
+++ b/gcm-aes.c
@@ -67,5 +67,4 @@ gcm_aes_digest(struct gcm_aes_ctx *ctx,
size_t length, uint8_t *digest)
{
GCM_DIGEST(ctx, aes_encrypt, length, digest);
-
}
diff --git a/macros.h b/macros.h
index fb814239..091b4f04 100644
--- a/macros.h
+++ b/macros.h
@@ -108,7 +108,7 @@ do { \
(p)[1] = ((i) >> 8) & 0xff; \
(p)[0] = (i) & 0xff; \
} while (0)
-
+
#define LE_READ_UINT32(p) \
( (((uint32_t) (p)[3]) << 24) \
| (((uint32_t) (p)[2]) << 16) \
@@ -145,7 +145,7 @@ do { \
just 32 - n and 64 - n results in undefined behaviour). Most uses
of these macros use a constant and non-zero rotation count. */
#define ROTL32(n,x) (((x)<<(n)) | ((x)>>((-(n)&31))))
-
+
#define ROTL64(n,x) (((x)<<(n)) | ((x)>>((-(n))&63)))
/* Requires that size > 0 */
@@ -222,8 +222,8 @@ do { \
/* Set the first char of padding to 0x80. This is safe since there \
is always at least one byte free */ \
\
- assert(__md_i < sizeof((ctx)->block)); \
- (ctx)->block[__md_i++] = 0x80; \
+ assert(__md_i < sizeof((ctx)->block)); \
+ (ctx)->block[__md_i++] = 0x80; \
\
if (__md_i > (sizeof((ctx)->block) - (size))) \
{ /* No room for length in this block. Process it and \
@@ -235,7 +235,7 @@ do { \
} \
memset((ctx)->block + __md_i, 0, \
sizeof((ctx)->block) - (size) - __md_i); \
- \
+ \
} while (0)
#endif /* NETTLE_MACROS_H_INCLUDED */
diff --git a/sha256.c b/sha256.c
index 5b77f9ce..276f1351 100644
--- a/sha256.c
+++ b/sha256.c
@@ -126,7 +126,7 @@ sha256_digest(struct sha256_ctx *ctx,
sha256_init(ctx);
}
-/* sha224 variant. FIXME: Move to seperate file? */
+/* sha224 variant. */
void
sha224_init(struct sha256_ctx *ctx)
diff --git a/sha512.c b/sha512.c
index 65297f33..e52e9cba 100644
--- a/sha512.c
+++ b/sha512.c
@@ -197,7 +197,7 @@ sha512_digest(struct sha512_ctx *ctx,
sha512_init(ctx);
}
-/* sha384 variant. FIXME: Move to separate file? */
+/* sha384 variant. */
void
sha384_init(struct sha512_ctx *ctx)
{