riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkg/micro-ecc: rename deprecated FEATURE_PERIPH_x

Browse Source
This commit is contained in:
Joakim Nohlgård 2017-12-08 05:25:13 +01:00
parent 01a82c870e
commit a70c540c1d
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/micro-ecc/patches/0002-Include-RIOT-Hardware-RNG-interface.patch
View File

@ -17,7 +17,7 @@ index 1bb595a..b13fdbe 100644
#include "types.h" #include "types.h"
+#ifdef FEATURE_PERIPH_HWRNG +#ifdef MODULE_PERIPH_HWRNG
+ +
#if (defined(_WIN32) || defined(_WIN64)) #if (defined(_WIN32) || defined(_WIN64))
/* Windows */ /* Windows */
@ -26,7 +26,7 @@ index 1bb595a..b13fdbe 100644
#endif /* platform */ #endif /* platform */
+#endif /* FEATURE_PERIPH_HWRNG */ +#endif /* MODULE_PERIPH_HWRNG */
+ +
#endif /* _UECC_PLATFORM_SPECIFIC_H_ */ #endif /* _UECC_PLATFORM_SPECIFIC_H_ */
diff --git a/uECC.c b/uECC.c diff --git a/uECC.c b/uECC.c
@ -37,7 +37,7 @@ index daa144a..3691fc4 100644
#include "uECC.h" #include "uECC.h"
#include "uECC_vli.h" #include "uECC_vli.h"
+#ifdef FEATURE_PERIPH_HWRNG +#ifdef MODULE_PERIPH_HWRNG
+#include "periph/hwrng.h" +#include "periph/hwrng.h"
+#endif +#endif
@ -47,14 +47,14 @@ index daa144a..3691fc4 100644
#include "asm_avr.inc" #include "asm_avr.inc"
#endif #endif
+#ifdef FEATURE_PERIPH_HWRNG +#ifdef MODULE_PERIPH_HWRNG
+int riot_hwrng(uint8_t *dest, unsigned size) { +int riot_hwrng(uint8_t *dest, unsigned size) {
+ hwrng_read(dest, size); + hwrng_read(dest, size);
+ return 1; + return 1;
+} +}
+#endif +#endif
+ +
+#ifdef FEATURE_PERIPH_HWRNG +#ifdef MODULE_PERIPH_HWRNG
#if default_RNG_defined #if default_RNG_defined
static uECC_RNG_Function g_rng_function = &default_RNG; static uECC_RNG_Function g_rng_function = &default_RNG;
#else #else
@ -68,7 +68,7 @@ index daa144a..3691fc4 100644
return 0; return 0;
} }
+#ifdef FEATURE_PERIPH_HWRNG +#ifdef MODULE_PERIPH_HWRNG
+ +
int uECC_make_key(uint8_t *public_key, int uECC_make_key(uint8_t *public_key,
uint8_t *private_key, uint8_t *private_key,
@ -77,7 +77,7 @@ index daa144a..3691fc4 100644
return 0; return 0;
} }
+#endif /* FEATURE_PERIPH_HWRNG */ +#endif /* MODULE_PERIPH_HWRNG */
+ +
int uECC_shared_secret(const uint8_t *public_key, int uECC_shared_secret(const uint8_t *public_key,
const uint8_t *private_key, const uint8_t *private_key,
@ -86,7 +86,7 @@ index daa144a..3691fc4 100644
return 1; return 1;
} }
+#ifdef FEATURE_PERIPH_HWRNG +#ifdef MODULE_PERIPH_HWRNG
+ +
int uECC_sign(const uint8_t *private_key, int uECC_sign(const uint8_t *private_key,
const uint8_t *message_hash, const uint8_t *message_hash,
@ -95,7 +95,7 @@ index daa144a..3691fc4 100644
return 0; return 0;
} }
+#endif /* FEATURE_PERIPH_HWRNG */ +#endif /* MODULE_PERIPH_HWRNG */
+ +
/* Compute an HMAC using K as a key (as in RFC 6979). Note that K is always /* Compute an HMAC using K as a key (as in RFC 6979). Note that K is always
the same size as the hash result size. */ the same size as the hash result size. */
@ -108,7 +108,7 @@ index 9911763..6433143 100644
*/ */
int uECC_curve_public_key_size(uECC_Curve curve); int uECC_curve_public_key_size(uECC_Curve curve);
+#ifdef FEATURE_PERIPH_HWRNG +#ifdef MODULE_PERIPH_HWRNG
+ +
/* uECC_make_key() function. /* uECC_make_key() function.
Create a public/private key pair. Create a public/private key pair.
@ -117,7 +117,7 @@ index 9911763..6433143 100644
*/ */
int uECC_make_key(uint8_t *public_key, uint8_t *private_key, uECC_Curve curve); int uECC_make_key(uint8_t *public_key, uint8_t *private_key, uECC_Curve curve);
+#endif /* FEATURE_PERIPH_HWRNG */ +#endif /* MODULE_PERIPH_HWRNG */
+ +
/* uECC_shared_secret() function. /* uECC_shared_secret() function.
Compute a shared secret given your secret key and someone else's public key. Compute a shared secret given your secret key and someone else's public key.
@ -126,7 +126,7 @@ index 9911763..6433143 100644
*/ */
int uECC_compute_public_key(const uint8_t *private_key, uint8_t *public_key, uECC_Curve curve); int uECC_compute_public_key(const uint8_t *private_key, uint8_t *public_key, uECC_Curve curve);
+#ifdef FEATURE_PERIPH_HWRNG +#ifdef MODULE_PERIPH_HWRNG
+ +
/* uECC_sign() function. /* uECC_sign() function.
Generate an ECDSA signature for a given hash value. Generate an ECDSA signature for a given hash value.
@ -135,11 +135,10 @@ index 9911763..6433143 100644
uint8_t *signature, uint8_t *signature,
uECC_Curve curve); uECC_Curve curve);
+#endif /* FEATURE_PERIPH_HWRNG */ +#endif /* MODULE_PERIPH_HWRNG */
+ +
/* uECC_HashContext structure. /* uECC_HashContext structure.
This is used to pass in an arbitrary hash function to uECC_sign_deterministic(). This is used to pass in an arbitrary hash function to uECC_sign_deterministic().
The structure will be used for multiple hash computations; each time a new hash The structure will be used for multiple hash computations; each time a new hash
-- --
2.7.4 2.7.4