Skip to content

Commit 95cb141

Browse files
chain-forgexcr45chain-forgexcr45
committed
Use explicit u8 when assigning a byte slice
1 parent 81499f5 commit 95cb141

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎secp256k1-sys/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ mod fuzz_dummy {
932932
let scalar_slice = slice::from_raw_parts(scalar, 32);
933933
let pk_slice = &(*point).0[..32];
934934

935-
let mut res_arr = [0; 32];
935+
let mut res_arr = [0u8; 32];
936936
for i in 0..32 {
937937
res_arr[i] = scalar_slice[i] ^ pk_slice[i] ^ 1;
938938
}
@@ -1123,7 +1123,7 @@ mod fuzz_dummy {
11231123
check_context_flags(cx, SECP256K1_START_VERIFY);
11241124
let mut pk = PublicKey::new();
11251125
pk.0.copy_from_slice(&(*keypair).0[32..]);
1126-
let mut sk = [0; 32];
1126+
let mut sk = [0u8; 32];
11271127
sk.copy_from_slice(&(*keypair).0[..32]);
11281128
assert_eq!(secp256k1_ec_pubkey_tweak_add(cx, &mut pk, tweak32), 1);
11291129
assert_eq!(secp256k1_ec_seckey_tweak_add(cx, (&mut sk[..]).as_mut_ptr(), tweak32), 1);

‎secp256k1-sys/src/recovery.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ mod fuzz_dummy {
123123
return 0;
124124
}
125125
// Pull the original pk out of the siganture
126-
let mut pk_ser = [0; 33];
126+
let mut pk_ser = [0u8; 33];
127127
pk_ser.copy_from_slice(&sig_sl[32..]);
128128
pk_ser.swap(0, 32);
129129
pk_ser[0] += 2;

‎src/key.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl fmt::Display for SecretKey {
4949
impl str::FromStr for SecretKey {
5050
type Err = Error;
5151
fn from_str(s: &str) -> Result<SecretKey, Error> {
52-
let mut res = [0; constants::SECRET_KEY_SIZE];
52+
let mut res = [0u8; constants::SECRET_KEY_SIZE];
5353
match from_hex(s, &mut res) {
5454
Ok(constants::SECRET_KEY_SIZE) => SecretKey::from_slice(&res),
5555
_ => Err(Error::InvalidSecretKey)
@@ -87,7 +87,7 @@ impl fmt::Display for PublicKey {
8787
impl str::FromStr for PublicKey {
8888
type Err = Error;
8989
fn from_str(s: &str) -> Result<PublicKey, Error> {
90-
let mut res = [0; constants::UNCOMPRESSED_PUBLIC_KEY_SIZE];
90+
let mut res = [0u8; constants::UNCOMPRESSED_PUBLIC_KEY_SIZE];
9191
match from_hex(s, &mut res) {
9292
Ok(constants::PUBLIC_KEY_SIZE) => {
9393
PublicKey::from_slice(
@@ -132,7 +132,7 @@ impl SecretKey {
132132
pub fn from_slice(data: &[u8])-> Result<SecretKey, Error> {
133133
match data.len() {
134134
constants::SECRET_KEY_SIZE => {
135-
let mut ret = [0; constants::SECRET_KEY_SIZE];
135+
let mut ret = [0u8; constants::SECRET_KEY_SIZE];
136136
unsafe {
137137
if ffi::secp256k1_ec_seckey_verify(
138138
ffi::secp256k1_context_no_precomp,
@@ -152,7 +152,7 @@ impl SecretKey {
152152
/// Creates a new secret key using data from BIP-340 [`::schnorrsig::KeyPair`]
153153
#[inline]
154154
pub fn from_keypair(keypair: &::schnorrsig::KeyPair) -> Self {
155-
let mut sk = [0; constants::SECRET_KEY_SIZE];
155+
let mut sk = [0u8; constants::SECRET_KEY_SIZE];
156156
unsafe {
157157
let ret = ffi::secp256k1_keypair_sec(
158158
ffi::secp256k1_context_no_precomp,
@@ -325,7 +325,7 @@ impl PublicKey {
325325
/// the y-coordinate is represented by only a single bit, as x determines
326326
/// it up to one bit.
327327
pub fn serialize(&self) -> [u8; constants::PUBLIC_KEY_SIZE] {
328-
let mut ret = [0; constants::PUBLIC_KEY_SIZE];
328+
let mut ret = [0u8; constants::PUBLIC_KEY_SIZE];
329329

330330
unsafe {
331331
let mut ret_len = constants::PUBLIC_KEY_SIZE as usize;
@@ -344,7 +344,7 @@ impl PublicKey {
344344

345345
/// Serialize the key as a byte-encoded pair of values, in uncompressed form
346346
pub fn serialize_uncompressed(&self) -> [u8; constants::UNCOMPRESSED_PUBLIC_KEY_SIZE] {
347-
let mut ret = [0; constants::UNCOMPRESSED_PUBLIC_KEY_SIZE];
347+
let mut ret = [0u8; constants::UNCOMPRESSED_PUBLIC_KEY_SIZE];
348348

349349
unsafe {
350350
let mut ret_len = constants::UNCOMPRESSED_PUBLIC_KEY_SIZE as usize;

‎src/lib.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
195195
impl str::FromStr for Signature {
196196
type Err = Error;
197197
fn from_str(s: &str) -> Result<Signature, Error> {
198-
let mut res = [0; 72];
198+
let mut res = [0u8; 72];
199199
match from_hex(s, &mut res) {
200200
Ok(x) => Signature::from_der(&res[0..x]),
201201
_ => Err(Error::InvalidSignature),
@@ -397,7 +397,7 @@ impl Signature {
397397
#[inline]
398398
/// Serializes the signature in compact format
399399
pub fn serialize_compact(&self) -> [u8; 64] {
400-
let mut ret = [0; 64];
400+
let mut ret = [0u8; 64];
401401
unsafe {
402402
let err = ffi::secp256k1_ecdsa_signature_serialize_compact(
403403
ffi::secp256k1_context_no_precomp,
@@ -473,7 +473,7 @@ impl Message {
473473
pub fn from_slice(data: &[u8]) -> Result<Message, Error> {
474474
match data.len() {
475475
constants::MESSAGE_SIZE => {
476-
let mut ret = [0; constants::MESSAGE_SIZE];
476+
let mut ret = [0u8; constants::MESSAGE_SIZE];
477477
ret[..].copy_from_slice(data);
478478
Ok(Message(ret))
479479
}
@@ -647,7 +647,7 @@ impl<C: Context> Secp256k1<C> {
647647
/// compilation with "rand" feature.
648648
#[cfg(any(test, feature = "rand"))]
649649
pub fn randomize<R: Rng + ?Sized>(&mut self, rng: &mut R) {
650-
let mut seed = [0; 32];
650+
let mut seed = [0u8; 32];
651651
rng.fill_bytes(&mut seed);
652652
self.seeded_randomize(&seed);
653653
}
@@ -672,7 +672,7 @@ impl<C: Context> Secp256k1<C> {
672672
}
673673

674674
fn der_length_check(sig: &ffi::Signature, max_len: usize) -> bool {
675-
let mut ser_ret = [0; 72];
675+
let mut ser_ret = [0u8; 72];
676676
let mut len: usize = ser_ret.len();
677677
unsafe {
678678
let err = ffi::secp256k1_ecdsa_signature_serialize_der(
@@ -687,7 +687,7 @@ fn der_length_check(sig: &ffi::Signature, max_len: usize) -> bool {
687687
}
688688

689689
fn compact_sig_has_zero_first_bit(sig: &ffi::Signature) -> bool {
690-
let mut compact = [0; 64];
690+
let mut compact = [0u8; 64];
691691
unsafe {
692692
let err = ffi::secp256k1_ecdsa_signature_serialize_compact(
693693
ffi::secp256k1_context_no_precomp,
@@ -1007,7 +1007,7 @@ mod tests {
10071007
let mut s = Secp256k1::new();
10081008
s.randomize(&mut thread_rng());
10091009

1010-
let mut msg = [0; 32];
1010+
let mut msg = [0u8; 32];
10111011
for _ in 0..100 {
10121012
thread_rng().fill_bytes(&mut msg);
10131013
let msg = Message::from_slice(&msg).unwrap();
@@ -1093,7 +1093,7 @@ mod tests {
10931093
let mut s = Secp256k1::new();
10941094
s.randomize(&mut thread_rng());
10951095

1096-
let mut msg = [0; 32];
1096+
let mut msg = [0u8; 32];
10971097
for _ in 0..100 {
10981098
thread_rng().fill_bytes(&mut msg);
10991099
let msg = Message::from_slice(&msg).unwrap();
@@ -1126,8 +1126,8 @@ mod tests {
11261126

11271127
// Wild keys: 1, CURVE_ORDER - 1
11281128
// Wild msgs: 1, CURVE_ORDER - 1
1129-
let mut wild_keys = [[0; 32]; 2];
1130-
let mut wild_msgs = [[0; 32]; 2];
1129+
let mut wild_keys = [[0u8; 32]; 2];
1130+
let mut wild_msgs = [[0u8; 32]; 2];
11311131

11321132
wild_keys[0][0] = 1;
11331133
wild_msgs[0][0] = 1;

‎src/recovery.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ mod tests {
239239
fn sign() {
240240
let mut s = Secp256k1::new();
241241
s.randomize(&mut thread_rng());
242-
let one = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
243-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1];
242+
let one: [u8; 32] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
243+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1];
244244

245245
let sk = SecretKey::from_slice(&one).unwrap();
246246
let msg = Message::from_slice(&one).unwrap();

‎src/schnorrsig.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ impl fmt::Display for Signature {
6565
impl str::FromStr for Signature {
6666
type Err = Error;
6767
fn from_str(s: &str) -> Result<Signature, Error> {
68-
let mut res = [0; constants::SCHNORRSIG_SIGNATURE_SIZE];
68+
let mut res = [0u8; constants::SCHNORRSIG_SIGNATURE_SIZE];
6969
match from_hex(s, &mut res) {
7070
Ok(constants::SCHNORRSIG_SIGNATURE_SIZE) => {
7171
Signature::from_slice(&res[0..constants::SCHNORRSIG_SIGNATURE_SIZE])
@@ -102,7 +102,7 @@ impl fmt::Display for PublicKey {
102102
impl str::FromStr for PublicKey {
103103
type Err = Error;
104104
fn from_str(s: &str) -> Result<PublicKey, Error> {
105-
let mut res = [0; constants::SCHNORRSIG_PUBLIC_KEY_SIZE];
105+
let mut res = [0u8; constants::SCHNORRSIG_PUBLIC_KEY_SIZE];
106106
match from_hex(s, &mut res) {
107107
Ok(constants::SCHNORRSIG_PUBLIC_KEY_SIZE) => {
108108
PublicKey::from_slice(&res[0..constants::SCHNORRSIG_PUBLIC_KEY_SIZE])
@@ -118,7 +118,7 @@ impl Signature {
118118
pub fn from_slice(data: &[u8]) -> Result<Signature, Error> {
119119
match data.len() {
120120
constants::SCHNORRSIG_SIGNATURE_SIZE => {
121-
let mut ret = [0; constants::SCHNORRSIG_SIGNATURE_SIZE];
121+
let mut ret = [0u8; constants::SCHNORRSIG_SIGNATURE_SIZE];
122122
ret[..].copy_from_slice(data);
123123
Ok(Signature(ret))
124124
}
@@ -183,7 +183,7 @@ impl KeyPair {
183183
/// Creates a Schnorr KeyPair directly from a secret key string
184184
#[inline]
185185
pub fn from_seckey_str<C: Signing>(secp: &Secp256k1<C>, s: &str) -> Result<KeyPair, Error> {
186-
let mut res = [0; constants::SECRET_KEY_SIZE];
186+
let mut res = [0u8; constants::SECRET_KEY_SIZE];
187187
match from_hex(s, &mut res) {
188188
Ok(constants::SECRET_KEY_SIZE) => {
189189
KeyPair::from_seckey_slice(secp, &res[0..constants::SECRET_KEY_SIZE])
@@ -304,7 +304,7 @@ impl PublicKey {
304304
/// the y-coordinate is represented by only a single bit, as x determines
305305
/// it up to one bit.
306306
pub fn serialize(&self) -> [u8; constants::SCHNORRSIG_PUBLIC_KEY_SIZE] {
307-
let mut ret = [0; constants::SCHNORRSIG_PUBLIC_KEY_SIZE];
307+
let mut ret = [0u8; constants::SCHNORRSIG_PUBLIC_KEY_SIZE];
308308

309309
unsafe {
310310
let err = ffi::secp256k1_xonly_pubkey_serialize(
@@ -612,7 +612,7 @@ mod tests {
612612

613613
macro_rules! hex_32 {
614614
($hex:expr) => {{
615-
let mut result = [0; 32];
615+
let mut result = [0u8; 32];
616616
from_hex($hex, &mut result).expect("valid hex string");
617617
result
618618
}};
@@ -625,7 +625,7 @@ mod tests {
625625

626626
let mut rng = thread_rng();
627627
let (seckey, pubkey) = secp.generate_schnorrsig_keypair(&mut rng);
628-
let mut msg = [0; 32];
628+
let mut msg = [0u8; 32];
629629

630630
for _ in 0..100 {
631631
rng.fill_bytes(&mut msg);
@@ -640,7 +640,7 @@ mod tests {
640640
#[test]
641641
fn test_schnorrsig_sign_with_aux_rand_verify() {
642642
test_schnorrsig_sign_helper(|secp, msg, seckey, rng| {
643-
let mut aux_rand = [0; 32];
643+
let mut aux_rand = [0u8; 32];
644644
rng.fill_bytes(&mut aux_rand);
645645
secp.schnorrsig_sign_with_aux_rand(msg, seckey, &aux_rand)
646646
})
@@ -863,7 +863,7 @@ mod tests {
863863

864864
let msg = Message::from_slice(&[1; 32]).unwrap();
865865
let keypair = KeyPair::from_seckey_slice(&s, &[2; 32]).unwrap();
866-
let aux = [3; 32];
866+
let aux = [3u8; 32];
867867
let sig = s
868868
.schnorrsig_sign_with_aux_rand(&msg, &keypair, &aux);
869869
static SIG_BYTES: [u8; constants::SCHNORRSIG_SIGNATURE_SIZE] = [

0 commit comments

Comments
 (0)