summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--rijndael.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ef7c54a46..e8b64b6e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,7 @@
82 - (djm) Don't clobber ssh_prng_cmds on install 82 - (djm) Don't clobber ssh_prng_cmds on install
83 - (stevesk) Include config.h in rijndael.c so we define intXX_t and 83 - (stevesk) Include config.h in rijndael.c so we define intXX_t and
84 u_intXX_t types on all platforms. 84 u_intXX_t types on all platforms.
85 - (stevesk) rijndael.c: cleanup missing declaration warnings.
85 86
8620001007 8720001007
87 - (stevesk) Print PAM return value in PAM log messages to aid 88 - (stevesk) Print PAM return value in PAM log messages to aid
diff --git a/rijndael.c b/rijndael.c
index fd1cc99b8..737007ec8 100644
--- a/rijndael.c
+++ b/rijndael.c
@@ -306,7 +306,7 @@ gen_tabs(void)
306 } 306 }
307 307
308 tab_gen = 1; 308 tab_gen = 1;
309}; 309}
310 310
311#define star_x(x) (((x) & 0x7f7f7f7f) << 1) ^ ((((x) & 0x80808080) >> 7) * 0x1b) 311#define star_x(x) (((x) & 0x7f7f7f7f) << 1) ^ ((((x) & 0x80808080) >> 7) * 0x1b)
312 312
@@ -399,7 +399,7 @@ rijndael_set_key(rijndael_ctx *ctx, const u4byte *in_key, const u4byte key_len,
399 } 399 }
400 400
401 return ctx; 401 return ctx;
402}; 402}
403 403
404/* encrypt a block of text */ 404/* encrypt a block of text */
405 405
@@ -444,7 +444,7 @@ rijndael_encrypt(rijndael_ctx *ctx, const u4byte *in_blk, u4byte *out_blk)
444 444
445 out_blk[0] = b0[0]; out_blk[1] = b0[1]; 445 out_blk[0] = b0[0]; out_blk[1] = b0[1];
446 out_blk[2] = b0[2]; out_blk[3] = b0[3]; 446 out_blk[2] = b0[2]; out_blk[3] = b0[3];
447}; 447}
448 448
449/* decrypt a block of text */ 449/* decrypt a block of text */
450 450
@@ -490,4 +490,4 @@ rijndael_decrypt(rijndael_ctx *ctx, const u4byte *in_blk, u4byte *out_blk)
490 490
491 out_blk[0] = b0[0]; out_blk[1] = b0[1]; 491 out_blk[0] = b0[0]; out_blk[1] = b0[1];
492 out_blk[2] = b0[2]; out_blk[3] = b0[3]; 492 out_blk[2] = b0[2]; out_blk[3] = b0[3];
493}; 493}