Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use more efficient StreamInput implementation #562

Closed
wants to merge 1 commit into from
Closed

Use more efficient StreamInput implementation #562

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 6 additions & 53 deletions crypto-core/src/main/java/com/palantir/crypto2/io/ApacheCtrDecryptingSeekableInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@
import com.palantir.crypto2.keys.KeyMaterial;
import com.palantir.seekio.SeekableInput;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Properties;
import org.apache.commons.crypto.stream.CtrCryptoInputStream;
import org.apache.commons.crypto.stream.input.Input;
import org.apache.commons.crypto.stream.input.StreamInput;
import org.apache.commons.crypto.utils.Utils;

/**
Expand All @@ -42,8 +41,11 @@ public final class ApacheCtrDecryptingSeekableInput extends CtrCryptoInputStream
* the OpenSSL library is able to be loaded.
*/
ApacheCtrDecryptingSeekableInput(SeekableInput input, KeyMaterial keyMaterial) throws IOException {
super(new InputAdapter(input), Utils.getCipherInstance(ALGORITHM, PROPS), BUFFER_SIZE,
keyMaterial.getSecretKey().getEncoded(), keyMaterial.getIv());
super(new StreamInput(new DefaultSeekableInputStream(input), BUFFER_SIZE),
Utils.getCipherInstance(ALGORITHM, PROPS),
BUFFER_SIZE,
keyMaterial.getSecretKey().getEncoded(),
keyMaterial.getIv());
}

@Override
Expand All @@ -65,53 +67,4 @@ public int read(byte[] bytes, int offset, int length) throws IOException {
public void close() throws IOException {
super.close();
}

private static final class InputAdapter implements Input {

private SeekableInput input;

private InputAdapter(SeekableInput input) {
this.input = input;
}

@Override
public int read(long position, byte[] buffer, int offset, int length) throws IOException {
input.seek(position);
return input.read(buffer, offset, length);
}

@Override
public int read(ByteBuffer dst) throws IOException {
byte[] bytes = new byte[dst.remaining()];
int read = input.read(bytes, 0, bytes.length);

if (read != -1) {
dst.put(bytes, 0, read);
}

return read;
}

@Override
public long skip(long bytes) throws IOException {
input.seek(input.getPos() + bytes);
return bytes;
}

@Override
public int available() throws IOException {
return 0;
}

@Override
public void seek(long position) throws IOException {
input.seek(position);
}

@Override
public void close() throws IOException {
input.close();
}
}

}