Refactor code in order to faciliate autoporting

DEVSIX-6119

Autoported commit.
Original commit hash: [43a7744f1]
Manual files:
kernel/src/main/java/com/itextpdf/kernel/crypto/CryptoUtil.java

Author: yulian-gaponenko

itext.tests/itext.kernel.tests/itext/kernel/crypto/CryptoUtilTest.cs

@@ -0,0 +1,55 @@
+/*
+This file is part of the iText (R) project.
+Copyright (c) 1998-2021 iText Group NV
+Authors: iText Software.
+
+This program is offered under a commercial and under the AGPL license.
+For commercial licensing, contact us at https://itextpdf.com/sales.  For AGPL licensing, see below.
+
+AGPL licensing:
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+using System;
+using Org.BouncyCastle.Asn1;
+using iText.Commons.Utils;
+using iText.IO.Source;
+using iText.Kernel.Exceptions;
+using iText.Test;
+
+namespace iText.Kernel.Crypto {
+    public class CryptoUtilTest : ExtendedITextTest {
+        [NUnit.Framework.Test]
+        public virtual void CreateBerStreamTest() {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            DerOutputStream stream = CryptoUtil.CreateAsn1OutputStream(baos, Org.BouncyCastle.Asn1.Asn1Encodable.Ber);
+            NUnit.Framework.Assert.IsNotNull(stream);
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void CreateDerStreamTest() {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            DerOutputStream stream = CryptoUtil.CreateAsn1OutputStream(baos, Org.BouncyCastle.Asn1.Asn1Encodable.Der);
+            NUnit.Framework.Assert.IsNotNull(stream);
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void CreateUnsupportedEncodingStreamTest() {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            Exception e = NUnit.Framework.Assert.Catch(typeof(NotSupportedException), () => CryptoUtil.CreateAsn1OutputStream
+                (baos, "DL"));
+            NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(KernelExceptionMessageConstant.UNSUPPORTED_ASN1_ENCODING
+                , "DL"), e.Message);
+        }
+    }
+}

itext/itext.kernel/itext/kernel/crypto/CryptoUtil.cs

@@ -43,6 +43,9 @@ source product.
 
 using System;
 using System.IO;
+using iText.Commons.Utils;
+using iText.Kernel.Exceptions;
+using Org.BouncyCastle.Asn1;
 using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Pkcs;
 using Org.BouncyCastle.X509;
@@ -61,6 +64,29 @@ public static X509Certificate ReadPublicCertificate(Stream s) {
         public static ICipherParameters ReadPrivateKeyFromPkcs12KeyStore(Stream keyStore, String pkAlias, char[] pkPassword) {
             return new Pkcs12Store(keyStore, pkPassword).GetKey(pkAlias).Key;
         }
+        
+        /// <summary>
+        /// Creates <see cref="DerOutputStream"/> instance which can be an implementation of one of the ASN1 encodings
+        /// writing logic. This method also asserts for unexpected ASN1 encodings.
+        /// </summary>
+        /// <param name="outputStream">the underlying stream</param>
+        /// <param name="asn1Encoding">ASN1 encoding that will be used for writing. Only DER and BER are allowed as values.</param>
+        /// <returns>a <see cref="DerOutputStream"/> instance. Exact stream implementation is chosen based on passed encoding.</returns>
+        /// <exception cref="NotSupportedException"></exception>
+        public static DerOutputStream CreateAsn1OutputStream(Stream outputStream, String asn1Encoding) {
+            if (Asn1Encodable.Ber.Equals(asn1Encoding)) {
+                return new Asn1OutputStream(outputStream);
+            }
+
+            if (Asn1Encodable.Der.Equals(asn1Encoding)) {
+                return new DerOutputStream(outputStream);
+            }
+
+            throw new NotSupportedException(
+                MessageFormatUtil.Format(KernelExceptionMessageConstant.UNSUPPORTED_ASN1_ENCODING, asn1Encoding)
+            );
+        }
+
 
     }
 }

itext/itext.kernel/itext/kernel/crypto/securityhandler/PubKeySecurityHandler.cs

@@ -51,6 +51,7 @@ source product.
 using Org.BouncyCastle.Security;
 using Org.BouncyCastle.X509;
 using iText.IO.Util;
+using iText.Kernel.Crypto;
 using iText.Kernel.Exceptions;
 using iText.Kernel.Pdf;
 
@@ -207,7 +208,7 @@ private byte[] GetEncodedRecipient(int index) {
             pkcs7input[22] = two;
             pkcs7input[23] = one;
             MemoryStream baos = new MemoryStream();
-            DerOutputStream k = DerOutputStream.Create(baos, Org.BouncyCastle.Asn1.Asn1Encodable.Der);
+            DerOutputStream k = CryptoUtil.CreateAsn1OutputStream(baos, Org.BouncyCastle.Asn1.Asn1Encodable.Der);
             Asn1Object obj = CreateDERForRecipient(pkcs7input, (X509Certificate)certificate);
             k.WriteObject(obj);
             cms = baos.ToArray();

itext/itext.kernel/itext/kernel/exceptions/KernelExceptionMessageConstant.cs

@@ -29,26 +29,22 @@ public sealed class KernelExceptionMessageConstant {
 
         public const String ANNOTATION_SHALL_HAVE_REFERENCE_TO_PAGE = "Annotation shall have reference to page.";
 
-        public const String APPEND_MODE_REQUIRES_A_DOCUMENT_WITHOUT_ERRORS_EVEN_IF_RECOVERY_IS_POSSIBLE = "Append "
-             + "mode requires a document without errors, even if recovery is possible.";
+        public const String APPEND_MODE_REQUIRES_A_DOCUMENT_WITHOUT_ERRORS_EVEN_IF_RECOVERY_IS_POSSIBLE = "Append mode requires a document without errors, even if recovery is possible.";
 
         public const String BAD_CERTIFICATE_AND_KEY = "Bad public key certificate and/or private key.";
 
-        public const String BAD_USER_PASSWORD = "Bad user password. Password is not provided or wrong password " +
-             "provided. Correct password should be passed to PdfReader constructor with properties. " + "See ReaderProperties#setPassword() method.";
+        public const String BAD_USER_PASSWORD = "Bad user password. Password is not provided or wrong password provided. Correct password should be passed "
+             + "to PdfReader constructor with properties. See ReaderProperties#setPassword() method.";
 
         public const String CANNOT_ADD_KID_TO_THE_FLUSHED_ELEMENT = "Cannot add kid to the flushed element.";
 
-        public const String CANNOT_BE_EMBEDDED_DUE_TO_LICENSING_RESTRICTIONS = "{0} cannot be embedded due to " + 
-            "licensing restrictions.";
+        public const String CANNOT_BE_EMBEDDED_DUE_TO_LICENSING_RESTRICTIONS = "{0} cannot be embedded due to licensing restrictions.";
 
         public const String CANNOT_CLOSE_DOCUMENT = "Cannot close document.";
 
-        public const String CANNOT_CLOSE_DOCUMENT_WITH_ALREADY_FLUSHED_PDF_CATALOG = "Cannot close document with "
-             + "already flushed PDF Catalog.";
+        public const String CANNOT_CLOSE_DOCUMENT_WITH_ALREADY_FLUSHED_PDF_CATALOG = "Cannot close document with already flushed PDF Catalog.";
 
-        public const String CANNOT_CONVERT_PDF_ARRAY_TO_AN_ARRAY_OF_BOOLEANS = "Cannot convert PdfArray to an " + 
-            "array of booleans";
+        public const String CANNOT_CONVERT_PDF_ARRAY_TO_AN_ARRAY_OF_BOOLEANS = "Cannot convert PdfArray to an array of booleans";
 
         public const String CANNOT_CONVERT_PDF_ARRAY_TO_DOUBLE_ARRAY = "Cannot convert PdfArray to an array " + "of doubles.";
 
@@ -470,12 +466,14 @@ public const String CONTENT_STREAM_MUST_NOT_INVOKE_OPERATORS_THAT_SPECIFY_COLORS
 
         public const String UNKNOWN_PDF_EXCEPTION = "Unknown PdfException.";
 
+        public const String UNSUPPORTED_ASN1_ENCODING = "Unknown ASN1-encoding {0}. Only DER and BER encodings are supported!";
+
         public const String UNSUPPORTED_FONT_EMBEDDING_STRATEGY = "Unsupported font embedding strategy.";
 
         public const String UNSUPPORTED_XOBJECT_TYPE = "Unsupported XObject type.";
 
         public const String WHEN_ADDING_OBJECT_REFERENCE_TO_THE_TAG_TREE_IT_MUST_BE_CONNECTED_TO_NOT_FLUSHED_OBJECT
-             = "" + "When adding object reference to the tag tree, it must be connected to not flushed object.";
+             = "When adding object reference to the tag tree, it must be connected to not flushed object.";
 
         public const String WHITE_POINT_IS_INCORRECTLY_SPECIFIED = "White point is incorrectly specified.";
 

port-hash

@@ -1 +1 @@
-6919b5c97acb1eb2784a38f17730272d732e8b21 
+3578748626f7e3c0b910f50baebb96f5783e3c02