diff options
Diffstat (limited to 'src/external/blowfish.c')
| -rw-r--r-- | src/external/blowfish.c | 118 |
1 files changed, 60 insertions, 58 deletions
diff --git a/src/external/blowfish.c b/src/external/blowfish.c index 72f6d794..99f9cc31 100644 --- a/src/external/blowfish.c +++ b/src/external/blowfish.c @@ -49,6 +49,8 @@ #endif #include <sys/types.h> +#include <stdint.h> + #include "libssh/blf.h" #undef inline @@ -68,12 +70,12 @@ #define BLFRND(s,p,i,j,n) (i ^= F(s,j) ^ (p)[n]) void -Blowfish_encipher(blf_ctx *c, u_int32_t *xl, u_int32_t *xr) +Blowfish_encipher(blf_ctx *c, uint32_t *xl, uint32_t *xr) { - u_int32_t Xl; - u_int32_t Xr; - u_int32_t *s = c->S[0]; - u_int32_t *p = c->P; + uint32_t Xl; + uint32_t Xr; + uint32_t *s = c->S[0]; + uint32_t *p = c->P; Xl = *xl; Xr = *xr; @@ -93,12 +95,12 @@ Blowfish_encipher(blf_ctx *c, u_int32_t *xl, u_int32_t *xr) } void -Blowfish_decipher(blf_ctx *c, u_int32_t *xl, u_int32_t *xr) +Blowfish_decipher(blf_ctx *c, uint32_t *xl, uint32_t *xr) { - u_int32_t Xl; - u_int32_t Xr; - u_int32_t *s = c->S[0]; - u_int32_t *p = c->P; + uint32_t Xl; + uint32_t Xr; + uint32_t *s = c->S[0]; + uint32_t *p = c->P; Xl = *xl; Xr = *xr; @@ -396,13 +398,13 @@ Blowfish_initstate(blf_ctx *c) *c = initstate; } -u_int32_t -Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, - u_int16_t *current) +uint32_t +Blowfish_stream2word(const uint8_t *data, uint16_t databytes, + uint16_t *current) { - u_int8_t i; - u_int16_t j; - u_int32_t temp; + uint8_t i; + uint16_t j; + uint32_t temp; temp = 0x00000000; j = *current; @@ -418,14 +420,14 @@ Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, } void -Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes) +Blowfish_expand0state(blf_ctx *c, const uint8_t *key, uint16_t keybytes) { - u_int16_t i; - u_int16_t j; - u_int16_t k; - u_int32_t temp; - u_int32_t datal; - u_int32_t datar; + uint16_t i; + uint16_t j; + uint16_t k; + uint32_t temp; + uint32_t datal; + uint32_t datar; j = 0; for (i = 0; i < BLF_N + 2; i++) { @@ -456,15 +458,15 @@ Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes) void -Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes, - const u_int8_t *key, u_int16_t keybytes) +Blowfish_expandstate(blf_ctx *c, const uint8_t *data, uint16_t databytes, + const uint8_t *key, uint16_t keybytes) { - u_int16_t i; - u_int16_t j; - u_int16_t k; - u_int32_t temp; - u_int32_t datal; - u_int32_t datar; + uint16_t i; + uint16_t j; + uint16_t k; + uint32_t temp; + uint32_t datal; + uint32_t datar; j = 0; for (i = 0; i < BLF_N + 2; i++) { @@ -499,7 +501,7 @@ Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes, } void -blf_key(blf_ctx *c, const u_int8_t *k, u_int16_t len) +blf_key(blf_ctx *c, const uint8_t *k, uint16_t len) { /* Initialize S-boxes and subkeys with Pi */ Blowfish_initstate(c); @@ -509,10 +511,10 @@ blf_key(blf_ctx *c, const u_int8_t *k, u_int16_t len) } void -blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks) +blf_enc(blf_ctx *c, uint32_t *data, uint16_t blocks) { - u_int32_t *d; - u_int16_t i; + uint32_t *d; + uint16_t i; d = data; for (i = 0; i < blocks; i++) { @@ -522,10 +524,10 @@ blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks) } void -blf_dec(blf_ctx *c, u_int32_t *data, u_int16_t blocks) +blf_dec(blf_ctx *c, uint32_t *data, uint16_t blocks) { - u_int32_t *d; - u_int16_t i; + uint32_t *d; + uint16_t i; d = data; for (i = 0; i < blocks; i++) { @@ -535,10 +537,10 @@ blf_dec(blf_ctx *c, u_int32_t *data, u_int16_t blocks) } void -blf_ecb_encrypt(blf_ctx *c, u_int8_t *data, u_int32_t len) +blf_ecb_encrypt(blf_ctx *c, uint8_t *data, uint32_t len) { - u_int32_t l, r; - u_int32_t i; + uint32_t l, r; + uint32_t i; for (i = 0; i < len; i += 8) { l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3]; @@ -557,10 +559,10 @@ blf_ecb_encrypt(blf_ctx *c, u_int8_t *data, u_int32_t len) } void -blf_ecb_decrypt(blf_ctx *c, u_int8_t *data, u_int32_t len) +blf_ecb_decrypt(blf_ctx *c, uint8_t *data, uint32_t len) { - u_int32_t l, r; - u_int32_t i; + uint32_t l, r; + uint32_t i; for (i = 0; i < len; i += 8) { l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3]; @@ -579,10 +581,10 @@ blf_ecb_decrypt(blf_ctx *c, u_int8_t *data, u_int32_t len) } void -blf_cbc_encrypt(blf_ctx *c, u_int8_t *iv, u_int8_t *data, u_int32_t len) +blf_cbc_encrypt(blf_ctx *c, uint8_t *iv, uint8_t *data, uint32_t len) { - u_int32_t l, r; - u_int32_t i, j; + uint32_t l, r; + uint32_t i, j; for (i = 0; i < len; i += 8) { for (j = 0; j < 8; j++) @@ -604,11 +606,11 @@ blf_cbc_encrypt(blf_ctx *c, u_int8_t *iv, u_int8_t *data, u_int32_t len) } void -blf_cbc_decrypt(blf_ctx *c, u_int8_t *iva, u_int8_t *data, u_int32_t len) +blf_cbc_decrypt(blf_ctx *c, uint8_t *iva, uint8_t *data, uint32_t len) { - u_int32_t l, r; - u_int8_t *iv; - u_int32_t i, j; + uint32_t l, r; + uint8_t *iv; + uint32_t i, j; iv = data + len - 16; data = data + len - 8; @@ -646,9 +648,9 @@ blf_cbc_decrypt(blf_ctx *c, u_int8_t *iva, u_int8_t *data, u_int32_t len) #if 0 void -report(u_int32_t data[], u_int16_t len) +report(uint32_t data[], uint16_t len) { - u_int16_t i; + uint16_t i; for (i = 0; i < len; i += 2) printf("Block %0hd: %08lx %08lx.\n", i / 2, data[i], data[i + 1]); @@ -661,17 +663,17 @@ main(void) char key[] = "AAAAA"; char key2[] = "abcdefghijklmnopqrstuvwxyz"; - u_int32_t data[10]; - u_int32_t data2[] = + uint32_t data[10]; + uint32_t data2[] = {0x424c4f57l, 0x46495348l}; - u_int16_t i; + uint16_t i; /* First test */ for (i = 0; i < 10; i++) data[i] = i; - blf_key(&c, (u_int8_t *) key, 5); + blf_key(&c, (uint8_t *) key, 5); blf_enc(&c, data, 5); blf_dec(&c, data, 1); blf_dec(&c, data + 2, 4); @@ -679,7 +681,7 @@ main(void) report(data, 10); /* Second test */ - blf_key(&c, (u_int8_t *) key2, strlen(key2)); + blf_key(&c, (uint8_t *) key2, strlen(key2)); blf_enc(&c, data2, 1); printf("\nShould read as: 0x324ed0fe 0xf413a203.\n"); report(data2, 2); |