Skip to content

Don't use padding for streaming cipher modes #155

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

Merged
merged 1 commit into from
Mar 6, 2018
Merged

Don't use padding for streaming cipher modes #155

Show file tree
Hide file tree
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
8 changes: 5 additions & 3 deletions src/main/java/org/jruby/ext/openssl/Cipher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,10 @@ public static final class Algorithm {
KNOWN_BLOCK_MODES.add("NONE"); // valid to pass into JCE
}

// Subset of KNOWN_BLOCK_MODES that do not require padding (and shouldn't have it by default).
private static final List<String> NO_PADDING_BLOCK_MODES = Arrays.asList(
"CFB", "CFB8", "OFB", "CTR", "GCM");

// Ruby to Java name String (or FALSE)
static final HashMap<String, String[]> supportedCiphers = new LinkedHashMap<String, String[]>(120, 1);
// we're _marking_ unsupported keys with a Boolean.FALSE mapping
Expand Down Expand Up @@ -557,12 +561,10 @@ String getPadding() {
}

private static String getPaddingType(final String padding, final String cryptoMode) {
//if ( "ECB".equals(cryptoMode) ) return "NoPadding";
// TODO check cryptoMode CFB/OFB
final String defaultPadding = "PKCS5Padding";

if ( padding == null ) {
if ( "GCM".equalsIgnoreCase(cryptoMode) ) {
if ( NO_PADDING_BLOCK_MODES.contains(cryptoMode) ) {
return "NoPadding";
}
return defaultPadding;
Expand Down
17 changes: 14 additions & 3 deletions src/test/java/org/jruby/ext/openssl/CipherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

package org.jruby.ext.openssl;

import org.junit.*;
Expand Down Expand Up @@ -97,13 +96,13 @@ private void doTestOsslToJsse() {
assertEquals("DES", alg.base);
assertEquals("EDE3", alg.version);
assertEquals("CFB", alg.mode);
assertEquals("DESede/CFB/PKCS5Padding", alg.getRealName());
assertEquals("DESede/CFB/NoPadding", alg.getRealName());

alg = Cipher.Algorithm.osslToJava("DES-CFB");
assertEquals("DES", alg.base);
assertEquals(null, alg.version);
assertEquals("CFB", alg.mode);
assertEquals("DES/CFB/PKCS5Padding", alg.getRealName());
assertEquals("DES/CFB/NoPadding", alg.getRealName());

alg = Cipher.Algorithm.osslToJava("DES3");
assertEquals("DES", alg.base);
Expand All @@ -129,6 +128,18 @@ private void doTestOsslToJsse() {
assertEquals("PKCS5Padding", alg.getPadding());
assertEquals("AES/CBC/PKCS5Padding", alg.getRealName());

alg = Cipher.Algorithm.osslToJava("AES-256-OFB");
assertEquals("AES", alg.base);
assertEquals("256", alg.version);
assertEquals("OFB", alg.mode);
assertEquals("AES/OFB/NoPadding", alg.getRealName());

alg = Cipher.Algorithm.osslToJava("AES-256-CTR");
assertEquals("AES", alg.base);
assertEquals("256", alg.version);
assertEquals("CTR", alg.mode);
assertEquals("AES/CTR/NoPadding", alg.getRealName());

alg = Cipher.Algorithm.osslToJava("AES-256-CBC-HMAC-SHA1");
assertEquals("AES", alg.base);
assertEquals("CBC", alg.mode);
Expand Down