Skip to content

Commit 90c4332

Browse files
committed
aes-128-gcm should map to AES/GCM/NoPadding (not PKCS5Padding)
1 parent 9173891 commit 90c4332

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/main/java/org/jruby/ext/openssl/Cipher.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,12 @@ private static String getPaddingType(final String padding, final String cryptoMo
561561
// TODO check cryptoMode CFB/OFB
562562
final String defaultPadding = "PKCS5Padding";
563563

564-
if ( padding == null ) return defaultPadding;
564+
if ( padding == null ) {
565+
if ( "GCM".equalsIgnoreCase(cryptoMode) ) {
566+
return "NoPadding";
567+
}
568+
return defaultPadding;
569+
}
565570
if ( padding.equalsIgnoreCase("PKCS5Padding") ) {
566571
return "PKCS5Padding";
567572
}

0 commit comments

Comments
 (0)