From 00b454d1f1f28adf6bb94f64d814fd41e865b8aa Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sun, 3 Mar 2013 14:03:54 -0800 Subject: [PATCH] Revert "crypto_scalarmult_raw()" This reverts commit 08a11d1a05e5e1885d2601d789231b7313ce1440. --- .../curve25519/ref/crypto_scalarmult.h | 1 - .../crypto_scalarmult/curve25519/ref/smult.c | 14 ++------------ .../include/sodium/crypto_scalarmult_curve25519.h | 2 -- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h b/src/libsodium/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h index cefb476c..ab642f74 100644 --- a/src/libsodium/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h +++ b/src/libsodium/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h @@ -4,7 +4,6 @@ #include "crypto_scalarmult_curve25519.h" #define crypto_scalarmult crypto_scalarmult_curve25519 -#define crypto_scalarmult_raw crypto_scalarmult_curve25519_raw #define crypto_scalarmult_base crypto_scalarmult_curve25519_base #define crypto_scalarmult_BYTES crypto_scalarmult_curve25519_BYTES #define crypto_scalarmult_SCALARBYTES crypto_scalarmult_curve25519_SCALARBYTES diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref/smult.c b/src/libsodium/crypto_scalarmult/curve25519/ref/smult.c index 2764fce3..6a479558 100644 --- a/src/libsodium/crypto_scalarmult/curve25519/ref/smult.c +++ b/src/libsodium/crypto_scalarmult/curve25519/ref/smult.c @@ -248,23 +248,13 @@ int crypto_scalarmult(unsigned char *q, const unsigned char *n, const unsigned char *p) { + unsigned int work[96]; unsigned char e[32]; unsigned int i; for (i = 0;i < 32;++i) e[i] = n[i]; e[0] &= 248; e[31] &= 127; e[31] |= 64; - return crypto_scalarmult_raw(q, e, p); -} - -int crypto_scalarmult_raw(unsigned char *q, - const unsigned char *n, - const unsigned char *p) -{ - unsigned int work[96]; - unsigned char e[32]; - unsigned int i; - for (i = 0;i < 32;++i) e[i] = n[i]; for (i = 0;i < 32;++i) work[i] = p[i]; mainloop(work,e); recip(work + 32,work + 32); @@ -272,4 +262,4 @@ int crypto_scalarmult_raw(unsigned char *q, freeze(work + 64); for (i = 0;i < 32;++i) q[i] = work[64 + i]; return 0; -} \ No newline at end of file +} diff --git a/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h index c3be0fec..d3f677ab 100644 --- a/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h +++ b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h @@ -8,14 +8,12 @@ extern "C" { #endif extern int crypto_scalarmult_curve25519_ref(unsigned char *,const unsigned char *,const unsigned char *); -extern int crypto_scalarmult_curve25519_ref_raw(unsigned char *,const unsigned char *, const unsigned char *); extern int crypto_scalarmult_curve25519_ref_base(unsigned char *,const unsigned char *); #ifdef __cplusplus } #endif #define crypto_scalarmult_curve25519 crypto_scalarmult_curve25519_ref -#define crypto_scalarmult_curve25519_raw crypto_scalarmult_curve25519_ref_raw #define crypto_scalarmult_curve25519_base crypto_scalarmult_curve25519_ref_base #define crypto_scalarmult_curve25519_BYTES crypto_scalarmult_curve25519_ref_BYTES #define crypto_scalarmult_curve25519_SCALARBYTES crypto_scalarmult_curve25519_ref_SCALARBYTES