shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

external: Use standard int types

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2015-04-10 12:57:07 +02:00
parent 53586ed4ba
commit c699b9ca94
4 changed files with 92 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/libssh/blf.h
View File

@@ -51,8 +51,8 @@
/* Blowfish context */ /* Blowfish context */
typedef struct BlowfishContext { typedef struct BlowfishContext {
u_int32_t S[4][256]; /* S-Boxes */ uint32_t S[4][256]; /* S-Boxes */
u_int32_t P[BLF_N + 2]; /* Subkeys */ uint32_t P[BLF_N + 2]; /* Subkeys */
} blf_ctx; } blf_ctx;
/* Raw access to customized Blowfish /* Raw access to customized Blowfish
@@ -61,27 +61,27 @@ typedef struct BlowfishContext {
* Blowfish_expand0state( state, key, keylen ) * Blowfish_expand0state( state, key, keylen )
*/ */
void Blowfish_encipher(blf_ctx *, u_int32_t *, u_int32_t *); void Blowfish_encipher(blf_ctx *, uint32_t *, uint32_t *);
void Blowfish_decipher(blf_ctx *, u_int32_t *, u_int32_t *); void Blowfish_decipher(blf_ctx *, uint32_t *, uint32_t *);
void Blowfish_initstate(blf_ctx *); void Blowfish_initstate(blf_ctx *);
void Blowfish_expand0state(blf_ctx *, const u_int8_t *, u_int16_t); void Blowfish_expand0state(blf_ctx *, const uint8_t *, uint16_t);
void Blowfish_expandstate void Blowfish_expandstate
(blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t); (blf_ctx *, const uint8_t *, uint16_t, const uint8_t *, uint16_t);
/* Standard Blowfish */ /* Standard Blowfish */
void blf_key(blf_ctx *, const u_int8_t *, u_int16_t); void blf_key(blf_ctx *, const uint8_t *, uint16_t);
void blf_enc(blf_ctx *, u_int32_t *, u_int16_t); void blf_enc(blf_ctx *, uint32_t *, uint16_t);
void blf_dec(blf_ctx *, u_int32_t *, u_int16_t); void blf_dec(blf_ctx *, uint32_t *, uint16_t);
void blf_ecb_encrypt(blf_ctx *, u_int8_t *, u_int32_t); void blf_ecb_encrypt(blf_ctx *, uint8_t *, uint32_t);
void blf_ecb_decrypt(blf_ctx *, u_int8_t *, u_int32_t); void blf_ecb_decrypt(blf_ctx *, uint8_t *, uint32_t);
void blf_cbc_encrypt(blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t); void blf_cbc_encrypt(blf_ctx *, uint8_t *, uint8_t *, uint32_t);
void blf_cbc_decrypt(blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t); void blf_cbc_decrypt(blf_ctx *, uint8_t *, uint8_t *, uint32_t);
/* Converts u_int8_t to u_int32_t */ /* Converts uint8_t to uint32_t */
u_int32_t Blowfish_stream2word(const u_int8_t *, u_int16_t , u_int16_t *); uint32_t Blowfish_stream2word(const uint8_t *, uint16_t , uint16_t *);
#endif /* !defined(HAVE_BCRYPT_PBKDF) && !defined(HAVE_BLH_H) */ #endif /* !defined(HAVE_BCRYPT_PBKDF) && !defined(HAVE_BLH_H) */
#endif /* _BLF_H */ #endif /* _BLF_H */

10
include/libssh/pki_priv.h
View File

@@ -22,9 +22,15 @@
#define PKI_PRIV_H_ #define PKI_PRIV_H_
#include "libssh/pki.h" #include "libssh/pki.h"
/* defined in bcrypt_pbkdf.c */ /* defined in bcrypt_pbkdf.c */
int bcrypt_pbkdf(const char *pass, size_t passlen, const u_int8_t *salt, int bcrypt_pbkdf(const char *pass,
size_t saltlen, u_int8_t *key, size_t keylen, unsigned int rounds); size_t passlen,
const uint8_t *salt,
size_t saltlen,
uint8_t *key,
size_t keylen,
unsigned int rounds);
#define RSA_HEADER_BEGIN "-----BEGIN RSA PRIVATE KEY-----" #define RSA_HEADER_BEGIN "-----BEGIN RSA PRIVATE KEY-----"
#define RSA_HEADER_END "-----END RSA PRIVATE KEY-----" #define RSA_HEADER_END "-----END RSA PRIVATE KEY-----"

18
src/external/bcrypt_pbkdf.c vendored
View File

@@ -59,10 +59,10 @@
#define BCRYPT_HASHSIZE (BCRYPT_BLOCKS * 4) #define BCRYPT_HASHSIZE (BCRYPT_BLOCKS * 4)
static void static void
bcrypt_hash(u_int8_t *sha2pass, u_int8_t *sha2salt, u_int8_t *out) bcrypt_hash(uint8_t *sha2pass, uint8_t *sha2salt, uint8_t *out)
{ {
blf_ctx state; blf_ctx state;
u_int8_t ciphertext[BCRYPT_HASHSIZE] = uint8_t ciphertext[BCRYPT_HASHSIZE] =
"OxychromaticBlowfishSwatDynamite"; "OxychromaticBlowfishSwatDynamite";
uint32_t cdata[BCRYPT_BLOCKS]; uint32_t cdata[BCRYPT_BLOCKS];
int i; int i;
@@ -100,14 +100,14 @@ bcrypt_hash(u_int8_t *sha2pass, u_int8_t *sha2salt, u_int8_t *out)
} }
int int
bcrypt_pbkdf(const char *pass, size_t passlen, const u_int8_t *salt, size_t saltlen, bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt, size_t saltlen,
u_int8_t *key, size_t keylen, unsigned int rounds) uint8_t *key, size_t keylen, unsigned int rounds)
{ {
u_int8_t sha2pass[SHA512_DIGEST_LENGTH]; uint8_t sha2pass[SHA512_DIGEST_LENGTH];
u_int8_t sha2salt[SHA512_DIGEST_LENGTH]; uint8_t sha2salt[SHA512_DIGEST_LENGTH];
u_int8_t out[BCRYPT_HASHSIZE]; uint8_t out[BCRYPT_HASHSIZE];
u_int8_t tmpout[BCRYPT_HASHSIZE]; uint8_t tmpout[BCRYPT_HASHSIZE];
u_int8_t *countsalt; uint8_t *countsalt;
size_t i, j, amt, stride; size_t i, j, amt, stride;
uint32_t count; uint32_t count;
SHA512CTX ctx; SHA512CTX ctx;

118
src/external/blowfish.c vendored
View File

@@ -49,6 +49,8 @@
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#include <stdint.h>
#include "libssh/blf.h" #include "libssh/blf.h"
#undef inline #undef inline
@@ -68,12 +70,12 @@
#define BLFRND(s,p,i,j,n) (i ^= F(s,j) ^ (p)[n]) #define BLFRND(s,p,i,j,n) (i ^= F(s,j) ^ (p)[n])
void 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; uint32_t Xl;
u_int32_t Xr; uint32_t Xr;
u_int32_t *s = c->S[0]; uint32_t *s = c->S[0];
u_int32_t *p = c->P; uint32_t *p = c->P;
Xl = *xl; Xl = *xl;
Xr = *xr; Xr = *xr;
@@ -93,12 +95,12 @@ Blowfish_encipher(blf_ctx *c, u_int32_t *xl, u_int32_t *xr)
} }
void 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; uint32_t Xl;
u_int32_t Xr; uint32_t Xr;
u_int32_t *s = c->S[0]; uint32_t *s = c->S[0];
u_int32_t *p = c->P; uint32_t *p = c->P;
Xl = *xl; Xl = *xl;
Xr = *xr; Xr = *xr;
@@ -396,13 +398,13 @@ Blowfish_initstate(blf_ctx *c)
*c = initstate; *c = initstate;
} }
u_int32_t uint32_t
Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, Blowfish_stream2word(const uint8_t *data, uint16_t databytes,
u_int16_t *current) uint16_t *current)
{ {
u_int8_t i; uint8_t i;
u_int16_t j; uint16_t j;
u_int32_t temp; uint32_t temp;
temp = 0x00000000; temp = 0x00000000;
j = *current; j = *current;
@@ -418,14 +420,14 @@ Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes,
} }
void 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; uint16_t i;
u_int16_t j; uint16_t j;
u_int16_t k; uint16_t k;
u_int32_t temp; uint32_t temp;
u_int32_t datal; uint32_t datal;
u_int32_t datar; uint32_t datar;
j = 0; j = 0;
for (i = 0; i < BLF_N + 2; i++) { 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 void
Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes, Blowfish_expandstate(blf_ctx *c, const uint8_t *data, uint16_t databytes,
const u_int8_t *key, u_int16_t keybytes) const uint8_t *key, uint16_t keybytes)
{ {
u_int16_t i; uint16_t i;
u_int16_t j; uint16_t j;
u_int16_t k; uint16_t k;
u_int32_t temp; uint32_t temp;
u_int32_t datal; uint32_t datal;
u_int32_t datar; uint32_t datar;
j = 0; j = 0;
for (i = 0; i < BLF_N + 2; i++) { 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 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 */ /* Initialize S-boxes and subkeys with Pi */
Blowfish_initstate(c); Blowfish_initstate(c);
@@ -509,10 +511,10 @@ blf_key(blf_ctx *c, const u_int8_t *k, u_int16_t len)
} }
void 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; uint32_t *d;
u_int16_t i; uint16_t i;
d = data; d = data;
for (i = 0; i < blocks; i++) { for (i = 0; i < blocks; i++) {
@@ -522,10 +524,10 @@ blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
} }
void 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; uint32_t *d;
u_int16_t i; uint16_t i;
d = data; d = data;
for (i = 0; i < blocks; i++) { for (i = 0; i < blocks; i++) {
@@ -535,10 +537,10 @@ blf_dec(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
} }
void 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; uint32_t l, r;
u_int32_t i; uint32_t i;
for (i = 0; i < len; i += 8) { for (i = 0; i < len; i += 8) {
l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3]; 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 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; uint32_t l, r;
u_int32_t i; uint32_t i;
for (i = 0; i < len; i += 8) { for (i = 0; i < len; i += 8) {
l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3]; 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 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; uint32_t l, r;
u_int32_t i, j; uint32_t i, j;
for (i = 0; i < len; i += 8) { for (i = 0; i < len; i += 8) {
for (j = 0; j < 8; j++) 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 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; uint32_t l, r;
u_int8_t *iv; uint8_t *iv;
u_int32_t i, j; uint32_t i, j;
iv = data + len - 16; iv = data + len - 16;
data = data + len - 8; 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 #if 0
void 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) for (i = 0; i < len; i += 2)
printf("Block %0hd: %08lx %08lx.\n", printf("Block %0hd: %08lx %08lx.\n",
i / 2, data[i], data[i + 1]); i / 2, data[i], data[i + 1]);
@@ -661,17 +663,17 @@ main(void)
char key[] = "AAAAA"; char key[] = "AAAAA";
char key2[] = "abcdefghijklmnopqrstuvwxyz"; char key2[] = "abcdefghijklmnopqrstuvwxyz";
u_int32_t data[10]; uint32_t data[10];
u_int32_t data2[] = uint32_t data2[] =
{0x424c4f57l, 0x46495348l}; {0x424c4f57l, 0x46495348l};
u_int16_t i; uint16_t i;
/* First test */ /* First test */
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
data[i] = 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_enc(&c, data, 5);
blf_dec(&c, data, 1); blf_dec(&c, data, 1);
blf_dec(&c, data + 2, 4); blf_dec(&c, data + 2, 4);
@@ -679,7 +681,7 @@ main(void)
report(data, 10); report(data, 10);
/* Second test */ /* Second test */
blf_key(&c, (u_int8_t *) key2, strlen(key2)); blf_key(&c, (uint8_t *) key2, strlen(key2));
blf_enc(&c, data2, 1); blf_enc(&c, data2, 1);
printf("\nShould read as: 0x324ed0fe 0xf413a203.\n"); printf("\nShould read as: 0x324ed0fe 0xf413a203.\n");
report(data2, 2); report(data2, 2);