Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

GroupReader was looking for an optional key, not a mandatory salt.

Browse Source 
This should've been changed when restricted groups were removed.
This commit is contained in:
akwizgran
2014-01-31 17:21:51 +00:00
parent 85b02eccc7
commit 93890d56f6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
briar-core/src/org/briarproject/messaging/GroupReader.java
View File

@@ -1,11 +1,12 @@
package org.briarproject.messaging; package org.briarproject.messaging;
import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH; import static org.briarproject.api.messaging.MessagingConstants.GROUP_SALT_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_GROUP_NAME_LENGTH; import static org.briarproject.api.messaging.MessagingConstants.MAX_GROUP_NAME_LENGTH;
import static org.briarproject.api.messaging.Types.GROUP; import static org.briarproject.api.messaging.Types.GROUP;
import java.io.IOException; import java.io.IOException;
import org.briarproject.api.FormatException;
import org.briarproject.api.crypto.CryptoComponent; import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.MessageDigest; import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.messaging.Group; import org.briarproject.api.messaging.Group;
@@ -28,13 +29,13 @@ class GroupReader implements StructReader<Group> {
r.addConsumer(digesting); r.addConsumer(digesting);
r.readStructStart(GROUP); r.readStructStart(GROUP);
String name = r.readString(MAX_GROUP_NAME_LENGTH); String name = r.readString(MAX_GROUP_NAME_LENGTH);
byte[] publicKey = null; if(name.length() == 0) throw new FormatException();
if(r.hasNull()) r.readNull(); byte[] salt = r.readBytes(GROUP_SALT_LENGTH);
else publicKey = r.readBytes(MAX_PUBLIC_KEY_LENGTH); if(salt.length != GROUP_SALT_LENGTH) throw new FormatException();
r.readStructEnd(); r.readStructEnd();
r.removeConsumer(digesting); r.removeConsumer(digesting);
// Build and return the group // Build and return the group
GroupId id = new GroupId(messageDigest.digest()); GroupId id = new GroupId(messageDigest.digest());
return new Group(id, name, publicKey); return new Group(id, name, salt);
} }
} }