Bladeren bron

Add group to constructors of riddles

Billy Barrow 1 jaar geleden
bovenliggende
commit
3549c19785

+ 4 - 2
src/lib/IdentityRiddle.vala

@@ -11,7 +11,8 @@ namespace Riddle {
 
         public InetSocketAddress app_socket_address { get; set; }
 
-        public IdentityRiddle.from_identity(string identiy) {
+        public IdentityRiddle.from_identity(string identiy, string group) {
+            this.group = group;
             var parts = identiy.split(":", 2);
             public_key = Base64.decode (parts[0]);
             private_key = Base64.decode (parts[1]);
@@ -20,7 +21,8 @@ namespace Riddle {
             Sodium.Random.random_bytes (token);
         }
 
-        public IdentityRiddle(string public_key) {
+        public IdentityRiddle(string public_key, string group) {
+            this.group = group;
             this.public_key = Base64.decode (public_key);
 
             token = new uint8[TOKEN_SIZE];

+ 2 - 1
src/lib/SharedKeyRiddle.vala

@@ -8,8 +8,9 @@ namespace Riddle {
 
         public InetSocketAddress app_socket_address { get; set; }
 
-        public SharedKeyRiddle(uint8[] shared_key) {
+        public SharedKeyRiddle(uint8[] shared_key, string group) {
             this.shared_key = shared_key;
+            this.group = group;
             
             token = new uint8[TOKEN_SIZE];
             Sodium.Random.random_bytes (token);

+ 2 - 2
src/tests/IdentityRiddleTests.vala

@@ -6,8 +6,8 @@ void identity_riddle_tests() {
         var identity = IdentityRiddle.generate_identity();
         var public_key =  IdentityRiddle.get_public_key_from_identity(identity);
 
-        var riddle1 = new IdentityRiddle(public_key);
-        var riddle2 = new IdentityRiddle.from_identity(identity);
+        var riddle1 = new IdentityRiddle(public_key, "test");
+        var riddle2 = new IdentityRiddle.from_identity(identity, "test");
         riddle1.app_socket_address = new InetSocketAddress.from_string("127.0.0.1", 5050);
         
         var challenge = new RiddleEnvelope.from_message(riddle1.seal(8080).to_message(), new InetAddress.from_string("127.0.0.1"));

+ 2 - 2
src/tests/SharedKeyRiddleTests.vala

@@ -5,8 +5,8 @@ void shared_key_riddle_tests() {
     Test.add_func("/riddle/shared_key_riddle/can_validate", () => {
         var key = SharedKeyRiddle.generate_key();
 
-        var riddle1 = new SharedKeyRiddle(key);
-        var riddle2 = new SharedKeyRiddle(key);
+        var riddle1 = new SharedKeyRiddle(key, "test");
+        var riddle2 = new SharedKeyRiddle(key, "test");
         riddle1.app_socket_address = new InetSocketAddress.from_string("127.0.0.1", 5050);
         
         var challenge = new RiddleEnvelope.from_message(riddle1.seal(8080).to_message(), new InetAddress.from_string("127.0.0.1"));