src/java.base/share/classes/javax/crypto/Cipher.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 319,333 ****
          StringTokenizer parser = new StringTokenizer(transformation, "/");
          try {
              while (parser.hasMoreTokens() && count < 3) {
                  parts[count++] = parser.nextToken().trim();
              }
!             if (count == 0 || count == 2 || parser.hasMoreTokens()) {
                  throw new NoSuchAlgorithmException("Invalid transformation"
                                                 + " format:" +
                                                 transformation);
              }
          } catch (NoSuchElementException e) {
              throw new NoSuchAlgorithmException("Invalid transformation " +
                                             "format:" + transformation);
          }
          if ((parts[0] == null) || (parts[0].length() == 0)) {
--- 319,337 ----
          StringTokenizer parser = new StringTokenizer(transformation, "/");
          try {
              while (parser.hasMoreTokens() && count < 3) {
                  parts[count++] = parser.nextToken().trim();
              }
!             if (count == 0 || count == 2) {
                  throw new NoSuchAlgorithmException("Invalid transformation"
                                                 + " format:" +
                                                 transformation);
              }
+             // treats all subsequent tokens as part of padding
+             if (count == 3 && parser.hasMoreTokens()) {
+                 parts[2] = parts[2] + parser.nextToken("\r\n");
+             }
          } catch (NoSuchElementException e) {
              throw new NoSuchAlgorithmException("Invalid transformation " +
                                             "format:" + transformation);
          }
          if ((parts[0] == null) || (parts[0].length() == 0)) {