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

Add crypto_sign_verify_detached()

Browse Source
This commit is contained in:
Frank Denis 2014-07-10 22:29:05 -07:00
parent 5b4a3b5715
commit a362711903
5 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libsodium/crypto_sign/crypto_sign.c
View File

@ -67,3 +67,10 @@ crypto_sign_detached(unsigned char *sig, unsigned long long *siglen,
{ {
return crypto_sign_ed25519_detached(sig, siglen, m, mlen, sk); return crypto_sign_ed25519_detached(sig, siglen, m, mlen, sk);
} }
int
crypto_sign_verify_detached(const unsigned char *sig, const unsigned char *m,
unsigned long long mlen, const unsigned char *pk)
{
return crypto_sign_ed25519_verify_detached(sig, m, mlen, pk);
}

1
src/libsodium/crypto_sign/ed25519/ref10/api.h
View File

@ -4,6 +4,7 @@
#define crypto_sign crypto_sign_ed25519 #define crypto_sign crypto_sign_ed25519
#define crypto_sign_detached crypto_sign_ed25519_detached #define crypto_sign_detached crypto_sign_ed25519_detached
#define crypto_sign_open crypto_sign_ed25519_open #define crypto_sign_open crypto_sign_ed25519_open
#define crypto_sign_verify_detached crypto_sign_ed25519_verify_detached
#define crypto_sign_keypair crypto_sign_ed25519_keypair #define crypto_sign_keypair crypto_sign_ed25519_keypair
#define crypto_sign_seed_keypair crypto_sign_ed25519_seed_keypair #define crypto_sign_seed_keypair crypto_sign_ed25519_seed_keypair
#define crypto_sign_BYTES crypto_sign_ed25519_BYTES #define crypto_sign_BYTES crypto_sign_ed25519_BYTES

46
src/libsodium/crypto_sign/ed25519/ref10/open.c
View File

@ -1,4 +1,5 @@
#include <limits.h>
#include <string.h> #include <string.h>
#include "api.h" #include "api.h"
@ -8,9 +9,8 @@
#include "sc.h" #include "sc.h"
int int
crypto_sign_open(unsigned char *m, unsigned long long *mlen, crypto_sign_verify_detached(const unsigned char *sig, const unsigned char *m,
const unsigned char *sm, unsigned long long smlen, unsigned long long mlen, const unsigned char *pk)
const unsigned char *pk)
{ {
crypto_hash_sha512_state hs; crypto_hash_sha512_state hs;
unsigned char h[64]; unsigned char h[64];
@ -20,14 +20,11 @@ crypto_sign_open(unsigned char *m, unsigned long long *mlen,
ge_p3 A; ge_p3 A;
ge_p2 R; ge_p2 R;
if (smlen < 64) { if (sig[63] & 224) {
goto badsig; return -1;
}
if (sm[63] & 224) {
goto badsig;
} }
if (ge_frombytes_negate_vartime(&A, pk) != 0) { if (ge_frombytes_negate_vartime(&A, pk) != 0) {
goto badsig; return -1;
} }
for (i = 0; i < 32; ++i) { for (i = 0; i < 32; ++i) {
d |= pk[i]; d |= pk[i];
@ -36,23 +33,36 @@ crypto_sign_open(unsigned char *m, unsigned long long *mlen,
return -1; return -1;
} }
crypto_hash_sha512_init(&hs); crypto_hash_sha512_init(&hs);
crypto_hash_sha512_update(&hs, sm, 32); crypto_hash_sha512_update(&hs, sig, 32);
crypto_hash_sha512_update(&hs, pk, 32); crypto_hash_sha512_update(&hs, pk, 32);
crypto_hash_sha512_update(&hs, sm + 64, smlen - 64); crypto_hash_sha512_update(&hs, m, mlen);
crypto_hash_sha512_final(&hs, h); crypto_hash_sha512_final(&hs, h);
sc_reduce(h); sc_reduce(h);
ge_double_scalarmult_vartime(&R, h, &A, sm + 32); ge_double_scalarmult_vartime(&R, h, &A, sig + 32);
ge_tobytes(rcheck, &R); ge_tobytes(rcheck, &R);
if (crypto_verify_32(rcheck, sm) == 0) {
memmove(m, sm + 64, smlen - 64); return crypto_verify_32(rcheck, sig);
*mlen = smlen - 64; }
return 0;
int
crypto_sign_open(unsigned char *m, unsigned long long *mlen,
const unsigned char *sm, unsigned long long smlen,
const unsigned char *pk)
{
if (smlen < 64 || smlen > SIZE_MAX) {
goto badsig;
} }
if (crypto_sign_verify_detached(sm, sm + 64, smlen - 64, pk) != 0) {
memset(m, 0, smlen - 64);
goto badsig;
}
*mlen = smlen - 64;
memmove(m, sm + 64, *mlen);
return 0;
badsig: badsig:
*mlen = 0; *mlen = 0;
memset(m, 0, smlen - 64);
return -1; return -1;
} }

5
src/libsodium/include/sodium/crypto_sign.h
View File

@ -62,6 +62,11 @@ int crypto_sign_detached(unsigned char *sig, unsigned long long *siglen,
const unsigned char *m, unsigned long long mlen, const unsigned char *m, unsigned long long mlen,
const unsigned char *sk); const unsigned char *sk);
SODIUM_EXPORT
int crypto_sign_verify_detached(const unsigned char *sig,
const unsigned char *m,
unsigned long long mlen,
const unsigned char *pk);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

6
src/libsodium/include/sodium/crypto_sign_ed25519.h
View File

@ -44,6 +44,12 @@ int crypto_sign_ed25519_detached(unsigned char *sig,
unsigned long long mlen, unsigned long long mlen,
const unsigned char *sk); const unsigned char *sk);
SODIUM_EXPORT
int crypto_sign_ed25519_verify_detached(const unsigned char *sig,
const unsigned char *m,
unsigned long long mlen,
const unsigned char *pk);
SODIUM_EXPORT SODIUM_EXPORT
int crypto_sign_ed25519_keypair(unsigned char *pk, unsigned char *sk); int crypto_sign_ed25519_keypair(unsigned char *pk, unsigned char *sk);