BlockSignatureBuffer: rename from BlockBuffer

Author: Korbik

…scuitsec/biscuit/crypto/BlockBuffer.java …biscuit/crypto/BlockSignatureBuffer.javasrc/main/java/org/biscuitsec/biscuit/crypto/BlockBuffer.java renamed to src/main/java/org/biscuitsec/biscuit/crypto/BlockSignatureBuffer.java src/main/java/org/biscuitsec/biscuit/crypto/BlockBuffer.java renamed to src/main/java/org/biscuitsec/biscuit/crypto/BlockSignatureBuffer.java

@@ -6,7 +6,7 @@
 import java.nio.ByteOrder;
 import java.util.Optional;
 
-public class BlockBuffer {
+public class BlockSignatureBuffer {
     public static byte[] getBufferSignature(PublicKey nextPubKey, byte[] data) {
         return getBufferSignature(nextPubKey, data, Optional.empty());
     }

src/main/java/org/biscuitsec/biscuit/crypto/Token.java

@@ -19,7 +19,7 @@ class Token {
 
     public Token(final Signer rootSigner, byte[] message, KeyPair next) throws NoSuchAlgorithmException, InvalidKeyException, SignatureException {
 
-        byte[] payload = BlockBuffer.getBufferSignature(next.public_key(), message);
+        byte[] payload = BlockSignatureBuffer.getBufferSignature(next.public_key(), message);
 
         byte[] signature = rootSigner.sign(payload);
 
@@ -41,7 +41,7 @@ public Token(final ArrayList<byte[]> blocks, final ArrayList<PublicKey> keys, fi
     }
 
     public Token append(KeyPair keyPair, byte[] message) throws NoSuchAlgorithmException, SignatureException, InvalidKeyException {
-        byte[] payload = BlockBuffer.getBufferSignature(keyPair.public_key(), message);
+        byte[] payload = BlockSignatureBuffer.getBufferSignature(keyPair.public_key(), message);
         byte[] signature = this.next.sign(payload);
 
         Token token = new Token(this.blocks, this.keys, this.signatures, keyPair);
@@ -60,7 +60,7 @@ public Either<Error, Void> verify(PublicKey root) throws NoSuchAlgorithmExceptio
             PublicKey next_key  = this.keys.get(i);
             byte[] signature = this.signatures.get(i);
 
-            byte[] payload = BlockBuffer.getBufferSignature(next_key, block);
+            byte[] payload = BlockSignatureBuffer.getBufferSignature(next_key, block);
             if (KeyPair.verify(current_key, payload, signature)) {
                 current_key = next_key;
             } else {

src/main/java/org/biscuitsec/biscuit/token/ThirdPartyBlockRequest.java

@@ -4,7 +4,7 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import io.vavr.control.Either;
 import io.vavr.control.Option;
-import org.biscuitsec.biscuit.crypto.BlockBuffer;
+import org.biscuitsec.biscuit.crypto.BlockSignatureBuffer;
 import org.biscuitsec.biscuit.crypto.PublicKey;
 import org.biscuitsec.biscuit.crypto.Signer;
 import org.biscuitsec.biscuit.datalog.SymbolTable;
@@ -33,7 +33,7 @@ public Either<Error.FormatError, ThirdPartyBlockContents> createBlock(final Sign
         }
 
         byte[] serializedBlock = res.get();
-        byte[] payload = BlockBuffer.getBufferSignature(this.previousKey, serializedBlock);
+        byte[] payload = BlockSignatureBuffer.getBufferSignature(this.previousKey, serializedBlock);
         byte[] signature = externalSigner.sign(payload);
 
         PublicKey publicKey = externalSigner.public_key();

src/main/java/org/biscuitsec/biscuit/token/UnverifiedBiscuit.java

@@ -1,7 +1,7 @@
 package org.biscuitsec.biscuit.token;
 
 import biscuit.format.schema.Schema.PublicKey.Algorithm;
-import org.biscuitsec.biscuit.crypto.BlockBuffer;
+import org.biscuitsec.biscuit.crypto.BlockSignatureBuffer;
 import org.biscuitsec.biscuit.crypto.KeyDelegate;
 import org.biscuitsec.biscuit.crypto.KeyPair;
 import org.biscuitsec.biscuit.crypto.PublicKey;
@@ -239,7 +239,7 @@ public UnverifiedBiscuit appendThirdPartyBlock(PublicKey externalKey, ThirdParty
             previousKey = this.serializedBiscuit.blocks.get(this.serializedBiscuit.blocks.size() - 1).key;
         }
         KeyPair nextKeyPair = KeyPair.generate(previousKey.algorithm);
-        byte[] payload = BlockBuffer.getBufferSignature(previousKey, blockResponse.payload);
+        byte[] payload = BlockSignatureBuffer.getBufferSignature(previousKey, blockResponse.payload);
         if (!KeyPair.verify(externalKey, payload, blockResponse.signature)) {
             throw new Error.FormatError.Signature.InvalidSignature("signature error: Verification equation was not satisfied");
         }

src/main/java/org/biscuitsec/biscuit/token/format/SerializedBiscuit.java

@@ -2,7 +2,7 @@
 
 import biscuit.format.schema.Schema;
 import io.vavr.Tuple2;
-import org.biscuitsec.biscuit.crypto.BlockBuffer;
+import org.biscuitsec.biscuit.crypto.BlockSignatureBuffer;
 import org.biscuitsec.biscuit.crypto.KeyDelegate;
 import org.biscuitsec.biscuit.crypto.KeyPair;
 import org.biscuitsec.biscuit.crypto.PublicKey;
@@ -239,7 +239,7 @@ static public Either<Error.FormatError, SerializedBiscuit> make(final org.biscui
             b.writeTo(stream);
             byte[] block = stream.toByteArray();
             org.biscuitsec.biscuit.crypto.PublicKey next_key = next.public_key();
-            byte[] payload = BlockBuffer.getBufferSignature(next_key, block);
+            byte[] payload = BlockSignatureBuffer.getBufferSignature(next_key, block);
             byte[] signature = rootSigner.sign(payload);
             SignedBlock signedBlock = new SignedBlock(block, next_key, signature, Option.none());
             Proof proof = new Proof(next);
@@ -265,7 +265,7 @@ public Either<Error.FormatError, SerializedBiscuit> append(final org.biscuitsec.
             KeyPair secretKey = this.proof.secretKey.get();
             org.biscuitsec.biscuit.crypto.PublicKey next_key = next.public_key();
 
-            byte[] payload = BlockBuffer.getBufferSignature(next_key, block, externalSignature.toJavaOptional());
+            byte[] payload = BlockSignatureBuffer.getBufferSignature(next_key, block, externalSignature.toJavaOptional());
             byte[] signature = this.proof.secretKey.get().sign(payload);
 
             SignedBlock signedBlock = new SignedBlock(block, next_key, signature, externalSignature);
@@ -335,7 +335,7 @@ public Either<Error, Void> verify(org.biscuitsec.biscuit.crypto.PublicKey root)
             org.biscuitsec.biscuit.crypto.PublicKey next_key = b.key;
             byte[] signature = b.signature;
 
-            byte[] payload = BlockBuffer.getBufferSealedSignature(next_key, block, signature);
+            byte[] payload = BlockSignatureBuffer.getBufferSealedSignature(next_key, block, signature);
 
             if (KeyPair.verify(current_key, payload, finalSignature)) {
                 return Right(null);
@@ -370,13 +370,13 @@ static Either<Error, org.biscuitsec.biscuit.crypto.PublicKey> verifyBlockSignatu
         }
         sgr.update(algo_buf);
         sgr.update(next_key.toBytes());
-        byte[] payload = BlockBuffer.getBufferSignature(next_key, block, signedBlock.externalSignature.toJavaOptional());
+        byte[] payload = BlockSignatureBuffer.getBufferSignature(next_key, block, signedBlock.externalSignature.toJavaOptional());
         if (!KeyPair.verify(publicKey, payload, signature)) {
             return Left(new Error.FormatError.Signature.InvalidSignature("signature error: Verification equation was not satisfied"));
         }
 
         if (signedBlock.externalSignature.isDefined()) {
-            byte[] externalPayload = BlockBuffer.getBufferSignature(publicKey, block);
+            byte[] externalPayload = BlockSignatureBuffer.getBufferSignature(publicKey, block);
             ExternalSignature externalSignature = signedBlock.externalSignature.get();
 
             if (!KeyPair.verify(externalSignature.key, externalPayload, externalSignature.signature)) {
@@ -448,7 +448,7 @@ public Either<Error, Void> seal() throws InvalidKeyException, NoSuchAlgorithmExc
         }
 
         KeyPair secretKey = this.proof.secretKey.get();
-        byte[] payload = BlockBuffer.getBufferSealedSignature(block.key, block.block, block.signature);
+        byte[] payload = BlockSignatureBuffer.getBufferSealedSignature(block.key, block.block, block.signature);
         byte[] signature = secretKey.sign(payload);
 
         this.proof.secretKey = Option.none();