lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-27 13:21:11 +03:00
Code Activity

ed25519: Replace unsigned long long with uint64_t

Browse Source 
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Anderson Toshiyuki Sasaki
2019-06-14 11:48:29 +02:00
committed by Andreas Schneider
parent 955d6f1b17
commit 91960409c3
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/libssh/ed25519.h
View File

@@ -56,8 +56,8 @@ int crypto_sign_ed25519_keypair(ed25519_pubkey pk, ed25519_privkey sk);
* @return 0 on success. * @return 0 on success.
*/ */
int crypto_sign_ed25519( int crypto_sign_ed25519(
unsigned char *sm,unsigned long long *smlen, unsigned char *sm, uint64_t *smlen,
const unsigned char *m,unsigned long long mlen, const unsigned char *m, uint64_t mlen,
const ed25519_privkey sk); const ed25519_privkey sk);
/** @internal /** @internal
@@ -71,8 +71,8 @@ int crypto_sign_ed25519(
* @returns 0 on success (supposedly). * @returns 0 on success (supposedly).
*/ */
int crypto_sign_ed25519_open( int crypto_sign_ed25519_open(
unsigned char *m,unsigned long long *mlen, unsigned char *m, uint64_t *mlen,
const unsigned char *sm,unsigned long long smlen, const unsigned char *sm, uint64_t smlen,
const ed25519_pubkey pk); const ed25519_pubkey pk);
/** @} */ /** @} */

16
src/external/ed25519.c vendored
View File

@@ -63,9 +63,9 @@ static void get_hram(unsigned char *hram,
const unsigned char *sm, const unsigned char *sm,
const unsigned char *pk, const unsigned char *pk,
unsigned char *playground, unsigned char *playground,
unsigned long long smlen) uint64_t smlen)
{ {
unsigned long long i; uint64_t i;
SHA512CTX ctx; SHA512CTX ctx;
for (i = 0;i < 32;++i) playground[i] = sm[i]; for (i = 0;i < 32;++i) playground[i] = sm[i];
for (i = 32;i < 64;++i) playground[i] = pk[i-32]; for (i = 32;i < 64;++i) playground[i] = pk[i-32];
@@ -111,9 +111,9 @@ int crypto_sign_ed25519_keypair(unsigned char *pk,
} }
int crypto_sign_ed25519(unsigned char *sm, int crypto_sign_ed25519(unsigned char *sm,
unsigned long long *smlen, uint64_t *smlen,
const unsigned char *m, const unsigned char *m,
unsigned long long mlen, uint64_t mlen,
const unsigned char *sk) const unsigned char *sk)
{ {
sc25519 sck, scs, scsk; sc25519 sck, scs, scsk;
@@ -122,7 +122,7 @@ int crypto_sign_ed25519(unsigned char *sm,
unsigned char r[32]; unsigned char r[32];
unsigned char s[32]; unsigned char s[32];
unsigned char extsk[64]; unsigned char extsk[64];
unsigned long long i; uint64_t i;
unsigned char hmg[SHA512_DIGEST_LEN]; unsigned char hmg[SHA512_DIGEST_LEN];
unsigned char hram[SHA512_DIGEST_LEN]; unsigned char hram[SHA512_DIGEST_LEN];
@@ -174,9 +174,9 @@ int crypto_sign_ed25519(unsigned char *sm,
} }
int crypto_sign_ed25519_open(unsigned char *m, int crypto_sign_ed25519_open(unsigned char *m,
unsigned long long *mlen, uint64_t *mlen,
const unsigned char *sm, const unsigned char *sm,
unsigned long long smlen, uint64_t smlen,
const unsigned char *pk) const unsigned char *pk)
{ {
unsigned int i; unsigned int i;
@@ -186,7 +186,7 @@ int crypto_sign_ed25519_open(unsigned char *m,
sc25519 schram, scs; sc25519 schram, scs;
unsigned char hram[SHA512_DIGEST_LEN]; unsigned char hram[SHA512_DIGEST_LEN];
*mlen = (unsigned long long) -1; *mlen = (uint64_t) -1;
if (smlen < 64) return -1; if (smlen < 64) return -1;
if (ge25519_unpackneg_vartime(&get1, pk)) { if (ge25519_unpackneg_vartime(&get1, pk)) {

4
src/pki_ed25519.c
View File

@@ -85,7 +85,7 @@ int pki_ed25519_sign(const ssh_key privkey,
{ {
int rc; int rc;
uint8_t *buffer; uint8_t *buffer;
unsigned long long dlen = 0; uint64_t dlen = 0;
buffer = malloc(hlen + ED25519_SIG_LEN); buffer = malloc(hlen + ED25519_SIG_LEN);
if (buffer == NULL) { if (buffer == NULL) {
@@ -125,7 +125,7 @@ int pki_ed25519_verify(const ssh_key pubkey,
const unsigned char *hash, const unsigned char *hash,
size_t hlen) size_t hlen)
{ {
unsigned long long mlen = 0; uint64_t mlen = 0;
uint8_t *buffer; uint8_t *buffer;
uint8_t *buffer2; uint8_t *buffer2;
int rc; int rc;