commit df8736b785eea30c5138ffe8b75201c48e46bcf2
author Adam Petcher <adam.petcher@oracle.com> Wed Dec 07 10:55:13 2016 -0500
committer Sean Mullan <mullan@openjdk.org> Wed Dec 07 10:55:13 2016 -0500
tree bb9f99c68f8f82add7a10c15d7691f2739b4eccc
parent 5c2b3026c267af862c8f41225248dbf9e8393c17

8158517: Minor optimizations to ISO10126PADDING

Co-authored-by: Bernd Eckenfels <ecki@zusammenkunft.net>
Reviewed-by: mullan

jdk/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java

diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java
index 7377fab..a713423 100644
--- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java
+++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -68,10 +68,10 @@
         }
 
         byte paddingOctet = (byte) (len & 0xff);
-        byte[] padding = new byte[len];
+        byte[] padding = new byte[len - 1];
         SunJCE.getRandom().nextBytes(padding);
-        padding[len-1] = paddingOctet;
-        System.arraycopy(padding, 0, in, off, len);
+        System.arraycopy(padding, 0, in, off, len - 1);
+        in[off + len - 1] = paddingOctet;
         return;
     }
 
@@ -101,7 +101,7 @@
             return -1;
         }
 
-        int start = off + len - ((int)lastByte & 0x0ff);
+        int start = off + len - padValue;
         if (start < off) {
             return -1;
         }