Paolo Asperti лет назад: 3
Родитель
Сommit
913de8515e
1 измененных файлов с 15 добавлено и 15 удалено
  1. 15 15
      src/utils.rs

+ 15 - 15
src/utils.rs

@@ -1,7 +1,7 @@
1
 use sodiumoxide::crypto::sign;
1
 use sodiumoxide::crypto::sign;
2
-use std::str;
3
 use std::env;
2
 use std::env;
4
 use std::process;
3
 use std::process;
4
+use std::str;
5
 
5
 
6
 fn print_help() {
6
 fn print_help() {
7
     println!("Usage:");
7
     println!("Usage:");
@@ -28,41 +28,41 @@ fn gen_keypair() {
28
 fn validate_keypair(pk: &str, sk: &str) {
28
 fn validate_keypair(pk: &str, sk: &str) {
29
     let sk1 = base64::decode(&sk);
29
     let sk1 = base64::decode(&sk);
30
     match sk1 {
30
     match sk1 {
31
-        Ok(_) => {},
31
+        Ok(_) => {}
32
         Err(_) => {
32
         Err(_) => {
33
             println!("Invalid secret key");
33
             println!("Invalid secret key");
34
             process::exit(0x0001);
34
             process::exit(0x0001);
35
-        },
35
+        }
36
     }
36
     }
37
     let sk1 = sk1.unwrap();
37
     let sk1 = sk1.unwrap();
38
 
38
 
39
     let secret_key = sign::SecretKey::from_slice(sk1.as_slice());
39
     let secret_key = sign::SecretKey::from_slice(sk1.as_slice());
40
     match secret_key {
40
     match secret_key {
41
-        Some(_) => {},
41
+        Some(_) => {}
42
         None => {
42
         None => {
43
             println!("Invalid Secret key");
43
             println!("Invalid Secret key");
44
             process::exit(0x0001);
44
             process::exit(0x0001);
45
-        },
45
+        }
46
     }
46
     }
47
     let secret_key = secret_key.unwrap();
47
     let secret_key = secret_key.unwrap();
48
 
48
 
49
     let pk1 = base64::decode(&pk);
49
     let pk1 = base64::decode(&pk);
50
     match pk1 {
50
     match pk1 {
51
-        Ok(_) => {},
51
+        Ok(_) => {}
52
         Err(_) => {
52
         Err(_) => {
53
             println!("Invalid public key");
53
             println!("Invalid public key");
54
             process::exit(0x0001);
54
             process::exit(0x0001);
55
-        },
55
+        }
56
     }
56
     }
57
     let pk1 = pk1.unwrap();
57
     let pk1 = pk1.unwrap();
58
 
58
 
59
     let public_key = sign::PublicKey::from_slice(pk1.as_slice());
59
     let public_key = sign::PublicKey::from_slice(pk1.as_slice());
60
     match public_key {
60
     match public_key {
61
-        Some(_) => {},
61
+        Some(_) => {}
62
         None => {
62
         None => {
63
             println!("Invalid Public key");
63
             println!("Invalid Public key");
64
             process::exit(0x0001);
64
             process::exit(0x0001);
65
-        },
65
+        }
66
     }
66
     }
67
     let public_key = public_key.unwrap();
67
     let public_key = public_key.unwrap();
68
 
68
 
@@ -70,11 +70,11 @@ fn validate_keypair(pk: &str, sk: &str) {
70
     let signed_data = sign::sign(random_data_to_test, &secret_key);
70
     let signed_data = sign::sign(random_data_to_test, &secret_key);
71
     let verified_data = sign::verify(&signed_data, &public_key);
71
     let verified_data = sign::verify(&signed_data, &public_key);
72
     match verified_data {
72
     match verified_data {
73
-        Ok(_) => {},
73
+        Ok(_) => {}
74
         Err(_) => {
74
         Err(_) => {
75
             println!("Key pair is INVALID");
75
             println!("Key pair is INVALID");
76
             process::exit(0x0001);
76
             process::exit(0x0001);
77
-        },
77
+        }
78
     }
78
     }
79
     let verified_data = verified_data.unwrap();
79
     let verified_data = verified_data.unwrap();
80
 
80
 
@@ -99,8 +99,8 @@ fn main() {
99
             if args.len() <= 3 {
99
             if args.len() <= 3 {
100
                 error_then_help("You must supply both the public and the secret key");
100
                 error_then_help("You must supply both the public and the secret key");
101
             }
101
             }
102
-            validate_keypair(args[2].as_str(),args[3].as_str());
103
-        },
104
-        _=>print_help(),
102
+            validate_keypair(args[2].as_str(), args[3].as_str());
103
+        }
104
+        _ => print_help(),
105
     }
105
     }
106
-}
106
+}