Merge branch 'MemoImplementation' of ssh://bitbucket.org/bilthon/fullerene into MemoImplementation
This commit is contained in:
commit
78b9d322b9
2 changed files with 4 additions and 1 deletions
|
@ -21,7 +21,7 @@ public class Memo implements ByteSerializable {
|
|||
public byte[] toBytes() {
|
||||
if ((this.from == null) || (this.to == null) || (this.nonce == null) ||(this.message == null)){
|
||||
return new byte[] { (byte) 0 };
|
||||
}
|
||||
}
|
||||
|
||||
byte[] result = new byte[this.from.length+this.to.length+this.nonce.length+this.message.length];
|
||||
System.arraycopy(this.from, 0, result, 0, this.from.length);
|
||||
|
|
|
@ -11,7 +11,10 @@ import java.io.ByteArrayInputStream;
|
|||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
<<<<<<< HEAD
|
||||
import java.nio.ByteBuffer;
|
||||
=======
|
||||
>>>>>>> 9d4ca57823604965fa940c07c0752249d701cd59
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.Arrays;
|
||||
|
|
Loading…
Reference in a new issue