eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-12 11:20:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Argon2 header to match upstream.

Browse Source
This commit is contained in:
Milan Broz
2018-07-06 20:19:38 +02:00
parent 4d110d4c82
commit 2f38ade0e0
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/crypto_backend/argon2/argon2.h
View File

@@ -29,10 +29,13 @@ extern "C" {
/* Symbols visibility control */ /* Symbols visibility control */
#ifdef A2_VISCTL #ifdef A2_VISCTL
#define ARGON2_PUBLIC __attribute__((visibility("default"))) #define ARGON2_PUBLIC __attribute__((visibility("default")))
#define ARGON2_LOCAL __attribute__ ((visibility ("hidden")))
#elif _MSC_VER #elif _MSC_VER
#define ARGON2_PUBLIC __declspec(dllexport) #define ARGON2_PUBLIC __declspec(dllexport)
#define ARGON2_LOCAL
#else #else
#define ARGON2_PUBLIC #define ARGON2_PUBLIC
#define ARGON2_LOCAL
#endif #endif
/* /*

20
lib/crypto_backend/argon2/blake2/blake2.h
View File

@@ -18,9 +18,7 @@
#ifndef PORTABLE_BLAKE2_H #ifndef PORTABLE_BLAKE2_H
#define PORTABLE_BLAKE2_H #define PORTABLE_BLAKE2_H
#include <stddef.h> #include <argon2.h>
#include <stdint.h>
#include <limits.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
@@ -69,19 +67,19 @@ enum {
}; };
/* Streaming API */ /* Streaming API */
int blake2b_init(blake2b_state *S, size_t outlen); ARGON2_LOCAL int blake2b_init(blake2b_state *S, size_t outlen);
int blake2b_init_key(blake2b_state *S, size_t outlen, const void *key, ARGON2_LOCAL int blake2b_init_key(blake2b_state *S, size_t outlen, const void *key,
size_t keylen); size_t keylen);
int blake2b_init_param(blake2b_state *S, const blake2b_param *P); ARGON2_LOCAL int blake2b_init_param(blake2b_state *S, const blake2b_param *P);
int blake2b_update(blake2b_state *S, const void *in, size_t inlen); ARGON2_LOCAL int blake2b_update(blake2b_state *S, const void *in, size_t inlen);
int blake2b_final(blake2b_state *S, void *out, size_t outlen); ARGON2_LOCAL int blake2b_final(blake2b_state *S, void *out, size_t outlen);
/* Simple API */ /* Simple API */
int blake2b(void *out, size_t outlen, const void *in, size_t inlen, ARGON2_LOCAL int blake2b(void *out, size_t outlen, const void *in, size_t inlen,
const void *key, size_t keylen); const void *key, size_t keylen);
/* Argon2 Team - Begin Code */ /* Argon2 Team - Begin Code */
int blake2b_long(void *out, size_t outlen, const void *in, size_t inlen); ARGON2_LOCAL int blake2b_long(void *out, size_t outlen, const void *in, size_t inlen);
/* Argon2 Team - End Code */ /* Argon2 Team - End Code */
#if defined(__cplusplus) #if defined(__cplusplus)

2
lib/crypto_backend/argon2/blake2/blamka-round-ref.h
View File

@@ -21,7 +21,7 @@
#include "blake2.h" #include "blake2.h"
#include "blake2-impl.h" #include "blake2-impl.h"
/*designed by the Lyra PHC team */ /* designed by the Lyra PHC team */
static BLAKE2_INLINE uint64_t fBlaMka(uint64_t x, uint64_t y) { static BLAKE2_INLINE uint64_t fBlaMka(uint64_t x, uint64_t y) {
const uint64_t m = UINT64_C(0xFFFFFFFF); const uint64_t m = UINT64_C(0xFFFFFFFF);
const uint64_t xy = (x & m) * (y & m); const uint64_t xy = (x & m) * (y & m);