re-invent a ByteArrayOutputStream which potentially avoids byte[] copy-ing

Author: kares

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

@@ -28,7 +28,6 @@
 package org.jruby.ext.openssl;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -111,6 +110,7 @@
 import org.jruby.ext.openssl.impl.ASN1Registry;
 
 import static org.jruby.ext.openssl.OpenSSL.*;
+import org.jruby.ext.openssl.util.ByteArrayOutputStream;
 
 /**
  * @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>

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

@@ -24,7 +24,6 @@
 package org.jruby.ext.openssl;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
@@ -60,6 +59,7 @@
 import org.jruby.ext.openssl.impl.pem.PEMException;
 import org.jruby.ext.openssl.impl.pem.PEMKeyPair;
 import org.jruby.ext.openssl.impl.pem.PEMParser;
+import org.jruby.ext.openssl.util.ByteArrayOutputStream;
 //import org.bouncycastle.util.io.pem.PemReader;
 
 import static org.jruby.ext.openssl.x509store.PEMInputOutput.getKeyFactory;

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

@@ -56,6 +56,11 @@ static RubyString newString(final Ruby runtime, final byte[] bytes) {
         return RubyString.newString(runtime, byteList);
     }
 
+    static RubyString newString(final Ruby runtime, final byte[] bytes, final int count) {
+        final ByteList byteList = new ByteList(bytes, 0, count, false);
+        return RubyString.newString(runtime, byteList);
+    }
+
     static RubyString newUTF8String(final Ruby runtime, final ByteList bytes) {
         ByteList byteList = new ByteList(RubyEncoding.encodeUTF8(bytes), UTF8Encoding.INSTANCE, false);
         return new RubyString(runtime, runtime.getString(), byteList);

src/main/java/org/jruby/ext/openssl/util/ByteArrayOutputStream.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2016 kares.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.jruby.ext.openssl.util;
+
+/**
+ * Allows direct buffer access for less copy-ing.
+ *
+ * @author kares
+ */
+public final class ByteArrayOutputStream extends java.io.ByteArrayOutputStream {
+
+    public ByteArrayOutputStream() {
+        super();
+    }
+
+    public ByteArrayOutputStream(int size) {
+        super(size);
+    }
+
+    public byte[] buffer() {
+        return buf;
+    }
+
+    public int size() {
+        return count;
+    }
+
+    @Override
+    public byte[] toByteArray() {
+        final int len = buf.length;
+        if (count == len) return buf; // no-copying
+
+        final byte[] copy = new byte[count];
+        System.arraycopy(buf, 0, copy, 0, count);
+        return copy;
+    }
+
+}

src/main/java/org/jruby/ext/openssl/x509store/PEMInputOutput.java

@@ -34,8 +34,6 @@
 import java.io.BufferedReader;
 import java.io.Reader;
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
 import java.math.BigInteger;
 
 import java.security.GeneralSecurityException;
@@ -130,8 +128,8 @@
 import org.jruby.ext.openssl.impl.ASN1Registry;
 import org.jruby.ext.openssl.impl.CipherSpec;
 import org.jruby.ext.openssl.impl.PKCS10Request;
-
 import org.jruby.ext.openssl.SecurityHelper;
+import org.jruby.ext.openssl.util.ByteArrayOutputStream;
 
 /**
  * Helper class to read and write PEM files correctly.
@@ -846,10 +844,10 @@ private static byte[] getEncoded(X509CRL crl) throws IOException {
 
     public static void writeDSAPublicKey(Writer _out, DSAPublicKey obj) throws IOException {
         BufferedWriter out = makeBuffered(_out);
-        byte[] encoding = getEncoded(obj);
+        final byte[] enc = getEncoded(obj);
         out.write(BEF_G + PEM_STRING_PUBLIC + AFT);
         out.newLine();
-        writeEncoded(out, encoding);
+        writeEncoded(out, enc, enc.length);
         out.write(BEF_E + PEM_STRING_PUBLIC + AFT);
         out.newLine();
         out.flush();
@@ -858,71 +856,71 @@ public static void writeDSAPublicKey(Writer _out, DSAPublicKey obj) throws IOExc
     /** writes an RSA public key encoded in an PKCS#1 RSA structure. */
     public static void writeRSAPublicKey(Writer _out, RSAPublicKey obj) throws IOException {
         BufferedWriter out = makeBuffered(_out);
-        byte[] encoding = getEncoded(obj);
+        final byte[] enc = getEncoded(obj);
         out.write(BEF_G + PEM_STRING_PUBLIC + AFT);
         out.newLine();
-        writeEncoded(out, encoding);
+        writeEncoded(out, enc, enc.length);
         out.write(BEF_E + PEM_STRING_PUBLIC + AFT);
         out.newLine();
         out.flush();
     }
 
     public static void writeECPublicKey(Writer _out, ECPublicKey obj) throws IOException {
         BufferedWriter out = makeBuffered(_out);
-        byte[] encoding = getEncoded(obj);
+        final byte[] enc = getEncoded(obj);
         out.write(BEF_G); out.write(PEM_STRING_PUBLIC); out.write(AFT);
         out.newLine();
-        writeEncoded(out, encoding);
+        writeEncoded(out, enc, enc.length);
         out.write(BEF_E); out.write(PEM_STRING_PUBLIC); out.write(AFT);
         out.newLine();
         out.flush();
     }
 
     public static void writePKCS7(Writer _out, ContentInfo obj) throws IOException {
         BufferedWriter out = makeBuffered(_out);
-        byte[] encoding = getEncoded(obj);
+        final byte[] enc = getEncoded(obj);
         out.write(BEF_G + PEM_STRING_PKCS7 + AFT);
         out.newLine();
-        writeEncoded(out,encoding);
+        writeEncoded(out, enc, enc.length);
         out.write(BEF_E + PEM_STRING_PKCS7 + AFT);
         out.newLine();
         out.flush();
     }
     public static void writePKCS7(Writer _out, CMSSignedData obj) throws IOException {
         BufferedWriter out = makeBuffered(_out);
-        byte[] encoding = getEncoded(obj);
+        final byte[] enc = getEncoded(obj);
         out.write(BEF_G + PEM_STRING_PKCS7 + AFT);
         out.newLine();
-        writeEncoded(out,encoding);
+        writeEncoded(out, enc, enc.length);
         out.write(BEF_E + PEM_STRING_PKCS7 + AFT);
         out.newLine();
         out.flush();
     }
-    public static void writePKCS7(final Writer _out, final byte[] encoded) throws IOException {
+    public static void writePKCS7(final Writer _out, final byte[] enc) throws IOException {
         BufferedWriter out = makeBuffered(_out);
         out.write(BEF_G + PEM_STRING_PKCS7 + AFT);
         out.newLine();
-        writeEncoded(out,encoded);
+        writeEncoded(out, enc, enc.length);
         out.write(BEF_E + PEM_STRING_PKCS7 + AFT);
         out.newLine();
         out.flush();
     }
     public static void writeX509Certificate(final Writer _out, final X509Certificate cert) throws IOException {
         BufferedWriter out = makeBuffered(_out);
-        byte[] encoding = getEncoded(cert);
+        final byte[] enc = getEncoded(cert);
         out.write(BEF_G + PEM_STRING_X509 + AFT);
         out.newLine();
-        writeEncoded(out, encoding);
+        writeEncoded(out, enc, enc.length);
         out.write(BEF_E + PEM_STRING_X509 + AFT);
         out.newLine();
         out.flush();
     }
     public static void writeX509Aux(final Writer _out, final X509AuxCertificate cert) throws IOException {
         BufferedWriter out = makeBuffered(_out);
-        byte[] encoding;
+        final byte[] encoding; final int encLen;
         try {
             if ( cert.aux == null ) {
-                encoding = cert.getEncoded();
+                encoding = cert.getEncoded(); encLen = encoding.length;
             }
             else {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -958,15 +956,15 @@ public static void writeX509Aux(final Writer _out, final X509AuxCertificate cert
                 }
                 enc = new DLSequence(a1).getEncoded();
                 baos.write(enc, 0, enc.length);
-                encoding = baos.toByteArray();
+                encoding = baos.buffer(); encLen = baos.size();
             }
         }
         catch (CertificateEncodingException e) {
             throw new IOException("problem with encoding object in write_X509_AUX", e);
         }
         out.write(BEF_G + PEM_STRING_X509_TRUSTED + AFT);
         out.newLine();
-        writeEncoded(out,encoding);
+        writeEncoded(out, encoding, encLen);
         out.write(BEF_E + PEM_STRING_X509_TRUSTED + AFT);
         out.newLine();
         out.flush();
@@ -976,7 +974,7 @@ public static void writeX509CRL(Writer _out, X509CRL obj) throws IOException {
         byte[] encoding = getEncoded(obj);
         out.write(BEF_G + PEM_STRING_X509_CRL + AFT);
         out.newLine();
-        writeEncoded(out, encoding);
+        writeEncoded(out, encoding, encoding.length);
         out.write(BEF_E + PEM_STRING_X509_CRL + AFT);
         out.newLine();
         out.flush();
@@ -986,7 +984,7 @@ public static void writeX509Request(Writer _out, PKCS10Request obj) throws IOExc
         byte[] encoding = getEncoded(obj.toASN1Structure());
         out.write(BEF_G + PEM_STRING_X509_REQ + AFT);
         out.newLine();
-        writeEncoded(out,encoding);
+        writeEncoded(out, encoding, encoding.length);
         out.write(BEF_E + PEM_STRING_X509_REQ + AFT);
         out.newLine();
         out.flush();
@@ -1012,12 +1010,11 @@ public static void writeDSAPrivateKey(Writer _out, DSAPrivateKey obj, CipherSpec
         v.add(new ASN1Integer(x));
 
         aOut.writeObject(new DLSequence(v));
-        byte[] encoding = bOut.toByteArray();
 
         if (cipher != null && passwd != null) {
-            writePemEncrypted(out, PEM_STRING_DSA, encoding, cipher, passwd);
+            writePemEncrypted(out, PEM_STRING_DSA, bOut.buffer(), bOut.size(), cipher, passwd);
         } else {
-            writePemPlain(out, PEM_STRING_DSA, encoding);
+            writePemPlain(out, PEM_STRING_DSA, bOut.buffer(), bOut.size());
         }
     }
 
@@ -1060,9 +1057,14 @@ public static void writeECParameters(Writer _out, ASN1ObjectIdentifier obj, Ciph
 
     private static void writePemPlain(final BufferedWriter out,
         final String PEM_ID, final byte[] encoding) throws IOException {
+        writePemPlain(out, PEM_ID, encoding, encoding.length);
+    }
+
+    private static void writePemPlain(final BufferedWriter out,
+        final String PEM_ID, final byte[] encoding, final int encLen) throws IOException {
         out.write(BEF_G); out.write(PEM_ID); out.write(AFT);
         out.newLine();
-        writeEncoded(out, encoding);
+        writeEncoded(out, encoding, encLen);
         out.write(BEF_E); out.write(PEM_ID); out.write(AFT);
         out.newLine();
         out.flush();
@@ -1071,6 +1073,12 @@ private static void writePemPlain(final BufferedWriter out,
     private static void writePemEncrypted(final BufferedWriter out,
         final String PEM_ID, final byte[] encoding,
         final CipherSpec cipherSpec, final char[] passwd) throws IOException {
+        writePemEncrypted(out, PEM_ID, encoding, encoding.length, cipherSpec, passwd);
+    }
+
+    private static void writePemEncrypted(final BufferedWriter out,
+        final String PEM_ID, final byte[] encoding, final int encCount,
+        final CipherSpec cipherSpec, final char[] passwd) throws IOException {
 
         final Cipher cipher = cipherSpec.getCipher();
         final byte[] iv = new byte[cipher.getBlockSize()];
@@ -1085,7 +1093,7 @@ private static void writePemEncrypted(final BufferedWriter out,
         final byte[] encData;
         try {
             cipher.init(Cipher.ENCRYPT_MODE, secretKey, new IvParameterSpec(iv));
-            encData = cipher.doFinal(encoding);
+            encData = cipher.doFinal(encoding, 0, encCount);
         }
         catch (InvalidKeyException e) {
             final String msg = e.getMessage();
@@ -1105,7 +1113,7 @@ private static void writePemEncrypted(final BufferedWriter out,
         writeHexEncoded(out, iv);
         out.newLine();
         out.newLine();
-        writeEncoded(out, encData);
+        writeEncoded(out, encData, encData.length);
         out.write(BEF_E); out.write(PEM_ID); out.write(AFT);
         out.flush();
     }
@@ -1141,11 +1149,10 @@ public static void writeDHParameters(Writer _out, DHParameterSpec params) throws
         ASN1OutputStream aOut = new ASN1OutputStream(bOut);
 
         aOut.writeObject(new DLSequence(v));
-        byte[] encoding = bOut.toByteArray();
 
         out.write(BEF_G); out.write(PEM_STRING_DHPARAMS); out.write(AFT);
         out.newLine();
-        writeEncoded(out, encoding);
+        writeEncoded(out, bOut.buffer(), bOut.size());
         out.write(BEF_E); out.write(PEM_STRING_DHPARAMS); out.write(AFT);
         out.newLine();
         out.flush();
@@ -1483,17 +1490,18 @@ private static void writeHexEncoded(BufferedWriter out, byte[] bytes) throws IOE
         }
     }
 
-    private static void writeEncoded(BufferedWriter out, byte[] bytes) throws IOException {
-        char[]  buf = new char[64];
-        bytes = Base64.encode(bytes);
+    private static void writeEncoded(BufferedWriter out,
+        byte[] bytes, final int bytesLen) throws IOException {
+        final char[] buf = new char[64];
+        bytes = Base64.encode(bytes, 0 ,bytesLen);
         for (int i = 0; i < bytes.length; i += buf.length) {
             int index = 0;
 
             while (index != buf.length) {
                 if ((i + index) >= bytes.length) {
                     break;
                 }
-                buf[index] = (char)bytes[i + index];
+                buf[index] = (char) bytes[i + index];
                 index++;
             }
             out.write(buf, 0, index);