haskell/cryptonite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32 from nomeata/master

Browse Source 
Endianess fixes
This commit is contained in:
Vincent Hanquez 2015-08-27 16:02:16 +01:00
commit 36d5fde149
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Crypto/Cipher/ChaChaPoly1305.hs
View File

@ -117,5 +117,5 @@ finalize :: State -> Poly1305.Auth
finalize (State _ macState aadLength plainLength) =
Poly1305.finalize $ Poly1305.updates macState
[ pad16 plainLength
, either (error "finalize: internal error") id $ P.fill 16 (P.putStorable (LE aadLength) >> P.putStorable (LE plainLength))
, either (error "finalize: internal error") id $ P.fill 16 (P.putStorable (toLE aadLength) >> P.putStorable (toLE plainLength))
]

2
cbits/cryptonite_scrypt.c
View File

@ -46,7 +46,7 @@ static void blockmix_salsa8(uint32_t *in, uint32_t *out, uint32_t *X, const uint
static inline uint64_t integerify(uint32_t *B, const uint32_t r)
{
return le64_to_cpu(*((uint64_t *) (B + (2*r-1) * 16)));
return B[(2*r-1) * 16] | (uint64_t)B[(2*r-1) * 16 + 1] << 32;
}
static inline uint32_t load32(const uint8_t *p)