cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move crypto_hash_sha256_state to the crypto_hash_sha256.h header file

Browse Source
This commit is contained in:
Frank Denis 2014-04-10 21:14:04 -07:00
parent 6c42962b57
commit 9fa62b38a4
4 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsodium/crypto_auth/hmacsha256/cp/hmac_hmacsha256.c
View File

@ -38,12 +38,6 @@
#include <stdlib.h>
#include <string.h>
typedef struct crypto_hash_sha256_state {
uint32_t state[8];
uint32_t count[2];
unsigned char buf[64];
} crypto_hash_sha256_state;
typedef struct crypto_hmac_sha256_state {
crypto_hash_sha256_state ictx;
crypto_hash_sha256_state octx;

6
src/libsodium/crypto_hash/sha256/cp/hash_sha256.c
View File

@ -37,12 +37,6 @@
#include <stdlib.h>
#include <string.h>
typedef struct crypto_hash_sha256_state {
uint32_t state[8];
uint32_t count[2];
unsigned char buf[64];
} crypto_hash_sha256_state;
void _SHA256_Init(crypto_hash_sha256_state *);
void _SHA256_Update(crypto_hash_sha256_state *, const void *, size_t);
void _SHA256_Final(unsigned char [32], crypto_hash_sha256_state *);

17
src/libsodium/crypto_pwhash/scryptxsalsa208sha256/sha256.h
View File

@ -33,20 +33,17 @@
#include <stdint.h>
typedef struct SHA256Context {
uint32_t state[8];
uint32_t count[2];
unsigned char buf[64];
} SHA256_CTX;
#include "crypto_hash_sha256.h"
typedef struct HMAC_SHA256Context {
SHA256_CTX ictx;
SHA256_CTX octx;
crypto_hash_sha256_state ictx;
crypto_hash_sha256_state octx;
} HMAC_SHA256_CTX;
void _SHA256_Init(SHA256_CTX *);
void _SHA256_Update(SHA256_CTX *, const void *, size_t);
void _SHA256_Final(unsigned char [32], SHA256_CTX *);
void _SHA256_Init(crypto_hash_sha256_state *);
void _SHA256_Update(crypto_hash_sha256_state *, const void *, size_t);
void _SHA256_Final(unsigned char [32], crypto_hash_sha256_state *);
void HMAC__SHA256_Init(HMAC_SHA256_CTX *, const void *, size_t);
void HMAC__SHA256_Update(HMAC_SHA256_CTX *, const void *, size_t);
void HMAC__SHA256_Final(unsigned char [32], HMAC_SHA256_CTX *);

9
src/libsodium/include/sodium/crypto_hash_sha256.h
View File

@ -2,6 +2,9 @@
#define crypto_hash_sha256_H
#include <stddef.h>
#include <stdint.h>
#include <stdlib.h>
#include "export.h"
#define crypto_hash_sha256_BYTES 32U
@ -14,6 +17,12 @@
extern "C" {
#endif
typedef struct crypto_hash_sha256_state {
uint32_t state[8];
uint32_t count[2];
unsigned char buf[64];
} crypto_hash_sha256_state;
SODIUM_EXPORT
size_t crypto_hash_sha256_bytes(void);