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

ReaderImpl now maintains either one or two bytes of lookahead,

Browse Source 
depending on the value of the first byte, so that an object's initial
tag is included in the data seen by the ObjectReader. Digests and
signatures can therefore be calculated over objects by their readers
without any risk of ambiguity.
This commit is contained in:
akwizgran
2011-07-22 17:39:59 +01:00
parent b5220b096a
commit a573e87c04
16 changed files with 244 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/net/sf/briar/api/serial/ObjectReader.java
View File

@@ -1,9 +1,8 @@
package net.sf.briar.api.serial;
import java.io.IOException;
import java.security.GeneralSecurityException;
public interface ObjectReader<T> {
T readObject(Reader r) throws IOException, GeneralSecurityException;
T readObject(Reader r) throws IOException;
}

17
api/net/sf/briar/api/serial/Reader.java
View File

@@ -1,7 +1,6 @@
package net.sf.briar.api.serial;
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.util.List;
import java.util.Map;
@@ -43,18 +42,16 @@ public interface Reader {
byte[] readRaw() throws IOException;
boolean hasList() throws IOException;
List<Object> readList() throws IOException, GeneralSecurityException;
<E> List<E> readList(Class<E> e) throws IOException,
GeneralSecurityException;
List<Object> readList() throws IOException;
<E> List<E> readList(Class<E> e) throws IOException;
boolean hasListStart() throws IOException;
void readListStart() throws IOException;
boolean hasListEnd() throws IOException;
void readListEnd() throws IOException;
boolean hasMap() throws IOException;
Map<Object, Object> readMap() throws IOException, GeneralSecurityException;
<K, V> Map<K, V> readMap(Class<K> k, Class<V> v) throws IOException,
GeneralSecurityException;
Map<Object, Object> readMap() throws IOException;
<K, V> Map<K, V> readMap(Class<K> k, Class<V> v) throws IOException;
boolean hasMapStart() throws IOException;
void readMapStart() throws IOException;
boolean hasMapEnd() throws IOException;
@@ -63,9 +60,7 @@ public interface Reader {
boolean hasNull() throws IOException;
void readNull() throws IOException;
boolean hasUserDefinedTag() throws IOException;
int readUserDefinedTag() throws IOException;
boolean hasUserDefined(int tag) throws IOException;
<T> T readUserDefined(int tag, Class<T> t) throws IOException;
void readUserDefinedTag(int tag) throws IOException;
<T> T readUserDefinedObject(int tag, Class<T> t) throws IOException,
GeneralSecurityException;
}