diff options
author | Andreas Schneider <mail@cynapses.org> | 2009-07-25 23:19:41 +0200 |
---|---|---|
committer | Andreas Schneider <mail@cynapses.org> | 2009-07-25 23:19:41 +0200 |
commit | 28b5d0f8751a8979231b3d2e6ccf182256219d52 (patch) | |
tree | 30618b26293838a766e56664ffcdbc0d583fb63c /libssh/crypt.c | |
parent | ba217dec1c7de84b1e51807660ccd2cc86f8dde4 (diff) | |
download | libssh-28b5d0f8751a8979231b3d2e6ccf182256219d52.tar.gz libssh-28b5d0f8751a8979231b3d2e6ccf182256219d52.tar.xz libssh-28b5d0f8751a8979231b3d2e6ccf182256219d52.zip |
Switch completly to stdint types.
Diffstat (limited to 'libssh/crypt.c')
-rw-r--r-- | libssh/crypt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libssh/crypt.c b/libssh/crypt.c index 655bcfab..e7f26339 100644 --- a/libssh/crypt.c +++ b/libssh/crypt.c @@ -39,8 +39,8 @@ #include "libssh/priv.h" #include "libssh/crypto.h" -u32 packet_decrypt_len(SSH_SESSION *session, char *crypted){ - u32 decrypted; +uint32_t packet_decrypt_len(SSH_SESSION *session, char *crypted){ + uint32_t decrypted; if (session->current_crypto) { if (packet_decrypt(session, crypted, @@ -57,7 +57,7 @@ u32 packet_decrypt_len(SSH_SESSION *session, char *crypted){ return ntohl(decrypted); } -int packet_decrypt(SSH_SESSION *session, void *data,u32 len) { +int packet_decrypt(SSH_SESSION *session, void *data,uint32_t len) { struct crypto_struct *crypto = session->current_crypto->in_cipher; char *out = NULL; @@ -90,12 +90,12 @@ int packet_decrypt(SSH_SESSION *session, void *data,u32 len) { return 0; } -unsigned char *packet_encrypt(SSH_SESSION *session, void *data, u32 len) { +unsigned char *packet_encrypt(SSH_SESSION *session, void *data, uint32_t len) { struct crypto_struct *crypto = NULL; HMACCTX ctx = NULL; char *out = NULL; unsigned int finallen; - u32 seq; + uint32_t seq; if (!session->current_crypto) { return NULL; /* nothing to do here */ @@ -132,7 +132,7 @@ unsigned char *packet_encrypt(SSH_SESSION *session, void *data, u32 len) { SAFE_FREE(out); return NULL; } - hmac_update(ctx,(unsigned char *)&seq,sizeof(u32)); + hmac_update(ctx,(unsigned char *)&seq,sizeof(uint32_t)); hmac_update(ctx,data,len); hmac_final(ctx,session->current_crypto->hmacbuf,&finallen); #ifdef DEBUG_CRYPTO @@ -179,7 +179,7 @@ int packet_hmac_verify(SSH_SESSION *session, ssh_buffer buffer, unsigned char hmacbuf[EVP_MAX_MD_SIZE] = {0}; HMACCTX ctx; unsigned int len; - u32 seq; + uint32_t seq; ctx = hmac_init(session->current_crypto->decryptMAC, 20, HMAC_SHA1); if (ctx == NULL) { @@ -188,7 +188,7 @@ int packet_hmac_verify(SSH_SESSION *session, ssh_buffer buffer, seq = htonl(session->recv_seq); - hmac_update(ctx, (unsigned char *) &seq, sizeof(u32)); + hmac_update(ctx, (unsigned char *) &seq, sizeof(uint32_t)); hmac_update(ctx, buffer_get(buffer), buffer_get_len(buffer)); hmac_final(ctx, hmacbuf, &len); |