diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b03da2d --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +/nbproject/private/ +/build/ +/dist/ +target +.DS_Store +/common/src/main/build \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..29a646a --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +bouncy-castle \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..15da752 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..1533b9c --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..7a1b5d7 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_codenameone_codenameone_core_7_0_26.xml b/.idea/libraries/Maven__com_codenameone_codenameone_core_7_0_26.xml new file mode 100644 index 0000000..7804aff --- /dev/null +++ b/.idea/libraries/Maven__com_codenameone_codenameone_core_7_0_26.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_codenameone_codenameone_core_7_0_8_b6.xml b/.idea/libraries/Maven__com_codenameone_codenameone_core_7_0_8_b6.xml new file mode 100644 index 0000000..6d284d7 --- /dev/null +++ b/.idea/libraries/Maven__com_codenameone_codenameone_core_7_0_8_b6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_codenameone_codenameone_javase_7_0_26.xml b/.idea/libraries/Maven__com_codenameone_codenameone_javase_7_0_26.xml new file mode 100644 index 0000000..caa0e38 --- /dev/null +++ b/.idea/libraries/Maven__com_codenameone_codenameone_javase_7_0_26.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_codenameone_codenameone_javase_7_0_8_b6.xml b/.idea/libraries/Maven__com_codenameone_codenameone_javase_7_0_8_b6.xml new file mode 100644 index 0000000..ed5b19a --- /dev/null +++ b/.idea/libraries/Maven__com_codenameone_codenameone_javase_7_0_8_b6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml b/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml new file mode 100644 index 0000000..f674d8e --- /dev/null +++ b/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xerial_sqlite_jdbc_3_7_15_M1.xml b/.idea/libraries/Maven__org_xerial_sqlite_jdbc_3_7_15_M1.xml new file mode 100644 index 0000000..574c7a0 --- /dev/null +++ b/.idea/libraries/Maven__org_xerial_sqlite_jdbc_3_7_15_M1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..de7b9eb --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..59904f7 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.adoc b/README.adoc new file mode 100644 index 0000000..8290793 --- /dev/null +++ b/README.adoc @@ -0,0 +1,23 @@ += Codename One BouncyCastle Library + +This is a port of the https://bouncycastle.org/[BouncyCastle] library for https://www.codenameone.com[Codename One] + +== Installation + +For maven projects, include the following in the `` section of your common/pom.xml file: + +[source,xml] +---- + + com.codenameone + bouncy-castle-lib + 1.0 + pom + +---- + +For non-maven projects, you can install through Codename One preferences. + +== References + +. https://www.codenameone.com[Codename One] \ No newline at end of file diff --git a/Stubber.jar b/Stubber.jar deleted file mode 100644 index 0e08279..0000000 Binary files a/Stubber.jar and /dev/null differ diff --git a/android/bouncy-castle-android.iml b/android/bouncy-castle-android.iml new file mode 100644 index 0000000..e1247b5 --- /dev/null +++ b/android/bouncy-castle-android.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/pom.xml b/android/pom.xml new file mode 100644 index 0000000..20a2f32 --- /dev/null +++ b/android/pom.xml @@ -0,0 +1,119 @@ + + + 4.0.0 + + com.codenameone + bouncy-castle + 1.0 + + com.codenameone + bouncy-castle-android + 1.0 + + bouncy-castle-android + + src/main/dummy + + + src/main/java + + + src/main/resources + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + package + + + + + + + + + + + + + + run + + + + + + + + + + ${project.groupId} + ${cn1lib.name}-common + ${project.version} + + + + + + kotlin + + + + codenameone_kotlin.properties + + + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains + annotations + + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + + + + + + + + diff --git a/bouncy-castle.iml b/bouncy-castle.iml new file mode 100644 index 0000000..f409c0e --- /dev/null +++ b/bouncy-castle.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/build.xml b/build.xml deleted file mode 100644 index 484cc82..0000000 --- a/build.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - Builds, tests, and runs the project BouncyCastleCN1Lib. - - - - - - - - - - - Currently testing a library project isn't supported - - - - Compile is forcing compliance to the supported API's/features for maximum device compatibility. This allows smaller - code size and wider device support - - - - - - - - - - - - - - You can't run a library project - - - - You can't run a library project - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Zipping rim native code - - - - - - - - - - - - - - - - - Zipping Android native code - - - - - - - - - - - - - - - - - Zipping win native code - - - - - - - - - - - - - - - - - Zipping ios native code - - - - - - - - - - - - - - - - - Zipping me native code - - - - diff --git a/common/bouncy-castle-common.iml b/common/bouncy-castle-common.iml new file mode 100644 index 0000000..b6a6030 --- /dev/null +++ b/common/bouncy-castle-common.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/codenameone_library.properties b/common/codenameone_library.properties similarity index 100% rename from codenameone_library.properties rename to common/codenameone_library.properties diff --git a/common/codenameone_library_appended.properties b/common/codenameone_library_appended.properties new file mode 100644 index 0000000..3dc34e8 --- /dev/null +++ b/common/codenameone_library_appended.properties @@ -0,0 +1,5 @@ +#Place here properties that should be appended to an existed property if exists +#in the project codenameone_settings.properties for example codename1.arg.android.xpermissions +#is an appended type property. +# +#Wed Jan 09 17:59:31 IST 2013 diff --git a/common/codenameone_library_required.properties b/common/codenameone_library_required.properties new file mode 100644 index 0000000..9bee35c --- /dev/null +++ b/common/codenameone_library_required.properties @@ -0,0 +1,8 @@ +#Place here properties that are required to build this Library and if they have +#a conflict with the main project or with other cn1lib the refresh cn1lib action +#will fail. +#For example codename1.arg.android.includeGPlayServices is a required property type, if the cn1lib +#needs the google play services but the main project marked this property to false +#The refresh cn1lib action will fail. +# +#Wed Jan 09 17:59:31 IST 2013 diff --git a/manifest.properties b/common/manifest.properties similarity index 100% rename from manifest.properties rename to common/manifest.properties diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 0000000..d206efc --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,290 @@ + + + + + com.codenameone + bouncy-castle + 1.0 + + 4.0.0 + com.codenameone + bouncy-castle-common + 1.0 + jar + + UTF-8 + 8 + 8 + + + + + + + com.codenameone + codenameone-core + ${cn1.version} + provided + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + + build-javadoc + + jar + + post-integration-test + + true + + + + + + 1.8 + protected + false + org.asciidoctor.Asciidoclet + + org.asciidoctor + asciidoclet + 1.5.6 + + ../common/src/main/resources/overview.adoc + + --base-dir ${project.basedir} + --attribute "name=${project.name}" + --attribute "version=${project.version}" + --attribute "title-link=https://github.com/shannah/CodeRAD[${project.name} ${project.version}]" + + + + https://www.codenameone.com/javadoc/ + ${basedir}/../javadoc-dependencies/com.codename1 + + + + + + com.codenameone + codenameone-maven-plugin + + + generate-gui-sources + process-sources + + generate-gui-sources + + + + cn1-compliance-check + process-classes + + compliance-check + + + + build-legacy-cn1lib + package + + cn1lib + + + + + + + + + + + + + kotlin + + + + ${basedir}/src/main/kotlin + + + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains + annotations + + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + + + + + + + appended-properties + + + ${basedir}/codenameone_library_appended.properties + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + copy-library-appended-properties + process-resources + + + + + + + + + + + run + + + + + + + + + required-properties + + + ${basedir}/codenameone_library_required.properties + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + copy-library-required-properties + process-resources + + + + + + + + + + + run + + + + + + + + + + copy-css + + + + ${basedir}/src/main/css + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + copy-css + process-resources + + + + + + + + + + + + + + + + run + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + + attach-css + package + + attach-artifact + + + + + ${project.build.directory}/${project.build.finalName}-cn1css.zip + zip + cn1css + + + + + + + + + + + + diff --git a/common/src/main/css/index.txt b/common/src/main/css/index.txt new file mode 100644 index 0000000..e69de29 diff --git a/common/src/main/css/theme.css b/common/src/main/css/theme.css new file mode 100644 index 0000000..abd96a1 --- /dev/null +++ b/common/src/main/css/theme.css @@ -0,0 +1 @@ +/* CSS file for filechooser */ diff --git a/common/src/main/java/com/codename1/crypto/EncryptedStorage.java b/common/src/main/java/com/codename1/crypto/EncryptedStorage.java new file mode 100644 index 0000000..caf4af4 --- /dev/null +++ b/common/src/main/java/com/codename1/crypto/EncryptedStorage.java @@ -0,0 +1,154 @@ +/* +* Permission is hereby granted, free of charge, to any person obtaining a copy of this software + * and associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR + * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +package com.codename1.crypto; + +import com.codename1.io.Log; +import com.codename1.io.Storage; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import org.bouncycastle.crypto.InvalidCipherTextException; +import org.bouncycastle.crypto.engines.AESEngine; +import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher; +import org.bouncycastle.crypto.params.KeyParameter; + +/** + * A Storage implementation that seamlessly encrypts it's contents based on a key. To setup this + * encryption use the Storage.install() method, notice that this only applies to storage and doesn't + * apply to the database or FileSystemStorage! + * + * @author Shai Almog + */ +public class EncryptedStorage extends Storage{ + private PaddedBufferedBlockCipher encryptCipher; + private PaddedBufferedBlockCipher decryptCipher; + + private byte[] key; + + @Override + public InputStream createInputStream(String name) throws IOException { + try { + byte[] buf = new byte[16]; + byte[] obuf = new byte[512]; + InputStream in = super.createInputStream(name); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + + int noBytesRead = 0; + int noBytesProcessed = 0; + + while ((noBytesRead = in.read(buf)) >= 0) { + noBytesProcessed = decryptCipher.processBytes(buf, 0, noBytesRead, obuf, 0); + out.write(obuf, 0, noBytesProcessed); + } + noBytesProcessed = decryptCipher.doFinal(obuf, 0); + out.write(obuf, 0, noBytesProcessed); + + out.close(); + + return new ByteArrayInputStream(out.toByteArray()); + } catch(InvalidCipherTextException err) { + throw new IOException(err.toString()); + } + } + + @Override + public OutputStream createOutputStream(String name) throws IOException { + return new EncryptedOutputStream(super.createOutputStream(name)); + } + + /** + * Use this method + */ + public static void install(String keyStr) { + try { + byte[] bytes = keyStr.getBytes("UTF-8"); + byte[] key = new byte[24]; + for(int iter = 0 ;iter < key.length ; iter++) { + key[iter] = bytes[iter % bytes.length]; + } + EncryptedStorage i = new EncryptedStorage(); + i.key = key; + i.InitCiphers(); + Storage.setStorageInstance(i); + } catch (UnsupportedEncodingException ex) { + // moronic exception + Log.e(ex); + } + } + + private void InitCiphers(){ + encryptCipher = new PaddedBufferedBlockCipher(new AESEngine()); + encryptCipher.init(true, new KeyParameter(key)); + decryptCipher = new PaddedBufferedBlockCipher(new AESEngine()); + decryptCipher.init(false, new KeyParameter(key)); + } + + class EncryptedOutputStream extends OutputStream { + private final OutputStream underlying; + private byte[] obuf = new byte[16536]; + + public EncryptedOutputStream(OutputStream underlying) { + this.underlying = underlying; + } + + @Override + public void close() throws IOException { + flush(); + underlying.close(); + } + + @Override + public void flush() throws IOException { + try { + int size = encryptCipher.doFinal(obuf, 0); + + if(size > 0) { + underlying.write(obuf, 0, size); + } + } catch(InvalidCipherTextException err) { + throw new IOException(err.toString()); + } + underlying.flush(); + } + + @Override + public void write(byte[] b) throws IOException { + write(b, 0, b.length); + } + + @Override + public void write(int b) throws IOException { + write(new byte[] { (byte)b }); + } + + @Override + public void write(byte[] b, int off, int len) throws IOException { + int encLen = (len / 16 + 1) * 16; + if(obuf.length < encLen) { + obuf = new byte[encLen + 16]; + } + int size = encryptCipher.processBytes(b, off, len, obuf, 0); + underlying.write(obuf, 0, size); + } + } +} diff --git a/common/src/main/java/com/codenameone/MyLibrary.java b/common/src/main/java/com/codenameone/MyLibrary.java new file mode 100644 index 0000000..e9789cb --- /dev/null +++ b/common/src/main/java/com/codenameone/MyLibrary.java @@ -0,0 +1,7 @@ +package com.codenameone; + +class MyLibrary { + public void helloWorld() { + System.out.println("Hello World"); + } +} \ No newline at end of file diff --git a/src/javabc/BigInteger.java b/common/src/main/java/javabc/BigInteger.java similarity index 100% rename from src/javabc/BigInteger.java rename to common/src/main/java/javabc/BigInteger.java diff --git a/src/javabc/FilterInputStream.java b/common/src/main/java/javabc/FilterInputStream.java similarity index 100% rename from src/javabc/FilterInputStream.java rename to common/src/main/java/javabc/FilterInputStream.java diff --git a/src/javabc/FilterOutputStream.java b/common/src/main/java/javabc/FilterOutputStream.java similarity index 100% rename from src/javabc/FilterOutputStream.java rename to common/src/main/java/javabc/FilterOutputStream.java diff --git a/src/javabc/SecureRandom.java b/common/src/main/java/javabc/SecureRandom.java similarity index 100% rename from src/javabc/SecureRandom.java rename to common/src/main/java/javabc/SecureRandom.java diff --git a/src/org/bouncycastle/LICENSE.java b/common/src/main/java/org/bouncycastle/LICENSE.java similarity index 100% rename from src/org/bouncycastle/LICENSE.java rename to common/src/main/java/org/bouncycastle/LICENSE.java diff --git a/src/org/bouncycastle/asn1/ASN1ApplicationSpecificParser.java b/common/src/main/java/org/bouncycastle/asn1/ASN1ApplicationSpecificParser.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1ApplicationSpecificParser.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1ApplicationSpecificParser.java diff --git a/src/org/bouncycastle/asn1/ASN1Boolean.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Boolean.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Boolean.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Boolean.java diff --git a/src/org/bouncycastle/asn1/ASN1Choice.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Choice.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Choice.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Choice.java diff --git a/src/org/bouncycastle/asn1/ASN1Encodable.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Encodable.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Encodable.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Encodable.java diff --git a/src/org/bouncycastle/asn1/ASN1EncodableVector.java b/common/src/main/java/org/bouncycastle/asn1/ASN1EncodableVector.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1EncodableVector.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1EncodableVector.java diff --git a/src/org/bouncycastle/asn1/ASN1Encoding.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Encoding.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Encoding.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Encoding.java diff --git a/src/org/bouncycastle/asn1/ASN1Enumerated.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Enumerated.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Enumerated.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Enumerated.java diff --git a/src/org/bouncycastle/asn1/ASN1Exception.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Exception.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Exception.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Exception.java diff --git a/src/org/bouncycastle/asn1/ASN1GeneralizedTime.java b/common/src/main/java/org/bouncycastle/asn1/ASN1GeneralizedTime.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1GeneralizedTime.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1GeneralizedTime.java diff --git a/src/org/bouncycastle/asn1/ASN1Generator.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Generator.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Generator.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Generator.java diff --git a/src/org/bouncycastle/asn1/ASN1InputStream.java b/common/src/main/java/org/bouncycastle/asn1/ASN1InputStream.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1InputStream.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1InputStream.java diff --git a/src/org/bouncycastle/asn1/ASN1Integer.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Integer.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Integer.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Integer.java diff --git a/src/org/bouncycastle/asn1/ASN1Null.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Null.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Null.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Null.java diff --git a/src/org/bouncycastle/asn1/ASN1Object.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Object.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Object.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Object.java diff --git a/src/org/bouncycastle/asn1/ASN1ObjectIdentifier.java b/common/src/main/java/org/bouncycastle/asn1/ASN1ObjectIdentifier.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1ObjectIdentifier.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1ObjectIdentifier.java diff --git a/src/org/bouncycastle/asn1/ASN1OctetString.java b/common/src/main/java/org/bouncycastle/asn1/ASN1OctetString.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1OctetString.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1OctetString.java diff --git a/src/org/bouncycastle/asn1/ASN1OctetStringParser.java b/common/src/main/java/org/bouncycastle/asn1/ASN1OctetStringParser.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1OctetStringParser.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1OctetStringParser.java diff --git a/src/org/bouncycastle/asn1/ASN1OutputStream.java b/common/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1OutputStream.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java diff --git a/src/org/bouncycastle/asn1/ASN1ParsingException.java b/common/src/main/java/org/bouncycastle/asn1/ASN1ParsingException.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1ParsingException.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1ParsingException.java diff --git a/src/org/bouncycastle/asn1/ASN1Primitive.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Primitive.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Primitive.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Primitive.java diff --git a/src/org/bouncycastle/asn1/ASN1Sequence.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Sequence.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Sequence.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Sequence.java diff --git a/src/org/bouncycastle/asn1/ASN1SequenceParser.java b/common/src/main/java/org/bouncycastle/asn1/ASN1SequenceParser.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1SequenceParser.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1SequenceParser.java diff --git a/src/org/bouncycastle/asn1/ASN1Set.java b/common/src/main/java/org/bouncycastle/asn1/ASN1Set.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1Set.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1Set.java diff --git a/src/org/bouncycastle/asn1/ASN1SetParser.java b/common/src/main/java/org/bouncycastle/asn1/ASN1SetParser.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1SetParser.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1SetParser.java diff --git a/src/org/bouncycastle/asn1/ASN1StreamParser.java b/common/src/main/java/org/bouncycastle/asn1/ASN1StreamParser.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1StreamParser.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1StreamParser.java diff --git a/src/org/bouncycastle/asn1/ASN1String.java b/common/src/main/java/org/bouncycastle/asn1/ASN1String.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1String.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1String.java diff --git a/src/org/bouncycastle/asn1/ASN1TaggedObject.java b/common/src/main/java/org/bouncycastle/asn1/ASN1TaggedObject.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1TaggedObject.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1TaggedObject.java diff --git a/src/org/bouncycastle/asn1/ASN1TaggedObjectParser.java b/common/src/main/java/org/bouncycastle/asn1/ASN1TaggedObjectParser.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1TaggedObjectParser.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1TaggedObjectParser.java diff --git a/src/org/bouncycastle/asn1/ASN1UTCTime.java b/common/src/main/java/org/bouncycastle/asn1/ASN1UTCTime.java similarity index 100% rename from src/org/bouncycastle/asn1/ASN1UTCTime.java rename to common/src/main/java/org/bouncycastle/asn1/ASN1UTCTime.java diff --git a/src/org/bouncycastle/asn1/BERApplicationSpecific.java b/common/src/main/java/org/bouncycastle/asn1/BERApplicationSpecific.java similarity index 100% rename from src/org/bouncycastle/asn1/BERApplicationSpecific.java rename to common/src/main/java/org/bouncycastle/asn1/BERApplicationSpecific.java diff --git a/src/org/bouncycastle/asn1/BERApplicationSpecificParser.java b/common/src/main/java/org/bouncycastle/asn1/BERApplicationSpecificParser.java similarity index 100% rename from src/org/bouncycastle/asn1/BERApplicationSpecificParser.java rename to common/src/main/java/org/bouncycastle/asn1/BERApplicationSpecificParser.java diff --git a/src/org/bouncycastle/asn1/BERConstructedOctetString.java b/common/src/main/java/org/bouncycastle/asn1/BERConstructedOctetString.java similarity index 100% rename from src/org/bouncycastle/asn1/BERConstructedOctetString.java rename to common/src/main/java/org/bouncycastle/asn1/BERConstructedOctetString.java diff --git a/src/org/bouncycastle/asn1/BERFactory.java b/common/src/main/java/org/bouncycastle/asn1/BERFactory.java similarity index 100% rename from src/org/bouncycastle/asn1/BERFactory.java rename to common/src/main/java/org/bouncycastle/asn1/BERFactory.java diff --git a/src/org/bouncycastle/asn1/BERGenerator.java b/common/src/main/java/org/bouncycastle/asn1/BERGenerator.java similarity index 100% rename from src/org/bouncycastle/asn1/BERGenerator.java rename to common/src/main/java/org/bouncycastle/asn1/BERGenerator.java diff --git a/src/org/bouncycastle/asn1/BEROctetString.java b/common/src/main/java/org/bouncycastle/asn1/BEROctetString.java similarity index 100% rename from src/org/bouncycastle/asn1/BEROctetString.java rename to common/src/main/java/org/bouncycastle/asn1/BEROctetString.java diff --git a/src/org/bouncycastle/asn1/BEROctetStringGenerator.java b/common/src/main/java/org/bouncycastle/asn1/BEROctetStringGenerator.java similarity index 100% rename from src/org/bouncycastle/asn1/BEROctetStringGenerator.java rename to common/src/main/java/org/bouncycastle/asn1/BEROctetStringGenerator.java diff --git a/src/org/bouncycastle/asn1/BEROctetStringParser.java b/common/src/main/java/org/bouncycastle/asn1/BEROctetStringParser.java similarity index 100% rename from src/org/bouncycastle/asn1/BEROctetStringParser.java rename to common/src/main/java/org/bouncycastle/asn1/BEROctetStringParser.java diff --git a/src/org/bouncycastle/asn1/BEROutputStream.java b/common/src/main/java/org/bouncycastle/asn1/BEROutputStream.java similarity index 100% rename from src/org/bouncycastle/asn1/BEROutputStream.java rename to common/src/main/java/org/bouncycastle/asn1/BEROutputStream.java diff --git a/src/org/bouncycastle/asn1/BERSequence.java b/common/src/main/java/org/bouncycastle/asn1/BERSequence.java similarity index 100% rename from src/org/bouncycastle/asn1/BERSequence.java rename to common/src/main/java/org/bouncycastle/asn1/BERSequence.java diff --git a/src/org/bouncycastle/asn1/BERSequenceGenerator.java b/common/src/main/java/org/bouncycastle/asn1/BERSequenceGenerator.java similarity index 100% rename from src/org/bouncycastle/asn1/BERSequenceGenerator.java rename to common/src/main/java/org/bouncycastle/asn1/BERSequenceGenerator.java diff --git a/src/org/bouncycastle/asn1/BERSequenceParser.java b/common/src/main/java/org/bouncycastle/asn1/BERSequenceParser.java similarity index 100% rename from src/org/bouncycastle/asn1/BERSequenceParser.java rename to common/src/main/java/org/bouncycastle/asn1/BERSequenceParser.java diff --git a/src/org/bouncycastle/asn1/BERSet.java b/common/src/main/java/org/bouncycastle/asn1/BERSet.java similarity index 100% rename from src/org/bouncycastle/asn1/BERSet.java rename to common/src/main/java/org/bouncycastle/asn1/BERSet.java diff --git a/src/org/bouncycastle/asn1/BERSetParser.java b/common/src/main/java/org/bouncycastle/asn1/BERSetParser.java similarity index 100% rename from src/org/bouncycastle/asn1/BERSetParser.java rename to common/src/main/java/org/bouncycastle/asn1/BERSetParser.java diff --git a/src/org/bouncycastle/asn1/BERTaggedObject.java b/common/src/main/java/org/bouncycastle/asn1/BERTaggedObject.java similarity index 100% rename from src/org/bouncycastle/asn1/BERTaggedObject.java rename to common/src/main/java/org/bouncycastle/asn1/BERTaggedObject.java diff --git a/src/org/bouncycastle/asn1/BERTaggedObjectParser.java b/common/src/main/java/org/bouncycastle/asn1/BERTaggedObjectParser.java similarity index 100% rename from src/org/bouncycastle/asn1/BERTaggedObjectParser.java rename to common/src/main/java/org/bouncycastle/asn1/BERTaggedObjectParser.java diff --git a/src/org/bouncycastle/asn1/BERTags.java b/common/src/main/java/org/bouncycastle/asn1/BERTags.java similarity index 100% rename from src/org/bouncycastle/asn1/BERTags.java rename to common/src/main/java/org/bouncycastle/asn1/BERTags.java diff --git a/src/org/bouncycastle/asn1/ConstructedOctetStream.java b/common/src/main/java/org/bouncycastle/asn1/ConstructedOctetStream.java similarity index 100% rename from src/org/bouncycastle/asn1/ConstructedOctetStream.java rename to common/src/main/java/org/bouncycastle/asn1/ConstructedOctetStream.java diff --git a/src/org/bouncycastle/asn1/DERApplicationSpecific.java b/common/src/main/java/org/bouncycastle/asn1/DERApplicationSpecific.java similarity index 100% rename from src/org/bouncycastle/asn1/DERApplicationSpecific.java rename to common/src/main/java/org/bouncycastle/asn1/DERApplicationSpecific.java diff --git a/src/org/bouncycastle/asn1/DERBMPString.java b/common/src/main/java/org/bouncycastle/asn1/DERBMPString.java similarity index 100% rename from src/org/bouncycastle/asn1/DERBMPString.java rename to common/src/main/java/org/bouncycastle/asn1/DERBMPString.java diff --git a/src/org/bouncycastle/asn1/DERBitString.java b/common/src/main/java/org/bouncycastle/asn1/DERBitString.java similarity index 100% rename from src/org/bouncycastle/asn1/DERBitString.java rename to common/src/main/java/org/bouncycastle/asn1/DERBitString.java diff --git a/src/org/bouncycastle/asn1/DERBoolean.java b/common/src/main/java/org/bouncycastle/asn1/DERBoolean.java similarity index 100% rename from src/org/bouncycastle/asn1/DERBoolean.java rename to common/src/main/java/org/bouncycastle/asn1/DERBoolean.java diff --git a/src/org/bouncycastle/asn1/DEREncodableVector.java b/common/src/main/java/org/bouncycastle/asn1/DEREncodableVector.java similarity index 100% rename from src/org/bouncycastle/asn1/DEREncodableVector.java rename to common/src/main/java/org/bouncycastle/asn1/DEREncodableVector.java diff --git a/src/org/bouncycastle/asn1/DEREnumerated.java b/common/src/main/java/org/bouncycastle/asn1/DEREnumerated.java similarity index 100% rename from src/org/bouncycastle/asn1/DEREnumerated.java rename to common/src/main/java/org/bouncycastle/asn1/DEREnumerated.java diff --git a/src/org/bouncycastle/asn1/DERExternal.java b/common/src/main/java/org/bouncycastle/asn1/DERExternal.java similarity index 100% rename from src/org/bouncycastle/asn1/DERExternal.java rename to common/src/main/java/org/bouncycastle/asn1/DERExternal.java diff --git a/src/org/bouncycastle/asn1/DERExternalParser.java b/common/src/main/java/org/bouncycastle/asn1/DERExternalParser.java similarity index 100% rename from src/org/bouncycastle/asn1/DERExternalParser.java rename to common/src/main/java/org/bouncycastle/asn1/DERExternalParser.java diff --git a/src/org/bouncycastle/asn1/DERFactory.java b/common/src/main/java/org/bouncycastle/asn1/DERFactory.java similarity index 100% rename from src/org/bouncycastle/asn1/DERFactory.java rename to common/src/main/java/org/bouncycastle/asn1/DERFactory.java diff --git a/src/org/bouncycastle/asn1/DERGeneralString.java b/common/src/main/java/org/bouncycastle/asn1/DERGeneralString.java similarity index 100% rename from src/org/bouncycastle/asn1/DERGeneralString.java rename to common/src/main/java/org/bouncycastle/asn1/DERGeneralString.java diff --git a/src/org/bouncycastle/asn1/DERGeneralizedTime.java b/common/src/main/java/org/bouncycastle/asn1/DERGeneralizedTime.java similarity index 100% rename from src/org/bouncycastle/asn1/DERGeneralizedTime.java rename to common/src/main/java/org/bouncycastle/asn1/DERGeneralizedTime.java diff --git a/src/org/bouncycastle/asn1/DERGenerator.java b/common/src/main/java/org/bouncycastle/asn1/DERGenerator.java similarity index 100% rename from src/org/bouncycastle/asn1/DERGenerator.java rename to common/src/main/java/org/bouncycastle/asn1/DERGenerator.java diff --git a/src/org/bouncycastle/asn1/DERIA5String.java b/common/src/main/java/org/bouncycastle/asn1/DERIA5String.java similarity index 100% rename from src/org/bouncycastle/asn1/DERIA5String.java rename to common/src/main/java/org/bouncycastle/asn1/DERIA5String.java diff --git a/src/org/bouncycastle/asn1/DERInteger.java b/common/src/main/java/org/bouncycastle/asn1/DERInteger.java similarity index 100% rename from src/org/bouncycastle/asn1/DERInteger.java rename to common/src/main/java/org/bouncycastle/asn1/DERInteger.java diff --git a/src/org/bouncycastle/asn1/DERNull.java b/common/src/main/java/org/bouncycastle/asn1/DERNull.java similarity index 100% rename from src/org/bouncycastle/asn1/DERNull.java rename to common/src/main/java/org/bouncycastle/asn1/DERNull.java diff --git a/src/org/bouncycastle/asn1/DERNumericString.java b/common/src/main/java/org/bouncycastle/asn1/DERNumericString.java similarity index 100% rename from src/org/bouncycastle/asn1/DERNumericString.java rename to common/src/main/java/org/bouncycastle/asn1/DERNumericString.java diff --git a/src/org/bouncycastle/asn1/DERObjectIdentifier.java b/common/src/main/java/org/bouncycastle/asn1/DERObjectIdentifier.java similarity index 100% rename from src/org/bouncycastle/asn1/DERObjectIdentifier.java rename to common/src/main/java/org/bouncycastle/asn1/DERObjectIdentifier.java diff --git a/src/org/bouncycastle/asn1/DEROctetString.java b/common/src/main/java/org/bouncycastle/asn1/DEROctetString.java similarity index 100% rename from src/org/bouncycastle/asn1/DEROctetString.java rename to common/src/main/java/org/bouncycastle/asn1/DEROctetString.java diff --git a/src/org/bouncycastle/asn1/DEROctetStringParser.java b/common/src/main/java/org/bouncycastle/asn1/DEROctetStringParser.java similarity index 100% rename from src/org/bouncycastle/asn1/DEROctetStringParser.java rename to common/src/main/java/org/bouncycastle/asn1/DEROctetStringParser.java diff --git a/src/org/bouncycastle/asn1/DEROutputStream.java b/common/src/main/java/org/bouncycastle/asn1/DEROutputStream.java similarity index 100% rename from src/org/bouncycastle/asn1/DEROutputStream.java rename to common/src/main/java/org/bouncycastle/asn1/DEROutputStream.java diff --git a/src/org/bouncycastle/asn1/DERPrintableString.java b/common/src/main/java/org/bouncycastle/asn1/DERPrintableString.java similarity index 100% rename from src/org/bouncycastle/asn1/DERPrintableString.java rename to common/src/main/java/org/bouncycastle/asn1/DERPrintableString.java diff --git a/src/org/bouncycastle/asn1/DERSequence.java b/common/src/main/java/org/bouncycastle/asn1/DERSequence.java similarity index 100% rename from src/org/bouncycastle/asn1/DERSequence.java rename to common/src/main/java/org/bouncycastle/asn1/DERSequence.java diff --git a/src/org/bouncycastle/asn1/DERSequenceGenerator.java b/common/src/main/java/org/bouncycastle/asn1/DERSequenceGenerator.java similarity index 100% rename from src/org/bouncycastle/asn1/DERSequenceGenerator.java rename to common/src/main/java/org/bouncycastle/asn1/DERSequenceGenerator.java diff --git a/src/org/bouncycastle/asn1/DERSequenceParser.java b/common/src/main/java/org/bouncycastle/asn1/DERSequenceParser.java similarity index 100% rename from src/org/bouncycastle/asn1/DERSequenceParser.java rename to common/src/main/java/org/bouncycastle/asn1/DERSequenceParser.java diff --git a/src/org/bouncycastle/asn1/DERSet.java b/common/src/main/java/org/bouncycastle/asn1/DERSet.java similarity index 100% rename from src/org/bouncycastle/asn1/DERSet.java rename to common/src/main/java/org/bouncycastle/asn1/DERSet.java diff --git a/src/org/bouncycastle/asn1/DERSetParser.java b/common/src/main/java/org/bouncycastle/asn1/DERSetParser.java similarity index 100% rename from src/org/bouncycastle/asn1/DERSetParser.java rename to common/src/main/java/org/bouncycastle/asn1/DERSetParser.java diff --git a/src/org/bouncycastle/asn1/DERT61String.java b/common/src/main/java/org/bouncycastle/asn1/DERT61String.java similarity index 100% rename from src/org/bouncycastle/asn1/DERT61String.java rename to common/src/main/java/org/bouncycastle/asn1/DERT61String.java diff --git a/src/org/bouncycastle/asn1/DERTaggedObject.java b/common/src/main/java/org/bouncycastle/asn1/DERTaggedObject.java similarity index 100% rename from src/org/bouncycastle/asn1/DERTaggedObject.java rename to common/src/main/java/org/bouncycastle/asn1/DERTaggedObject.java diff --git a/src/org/bouncycastle/asn1/DERTags.java b/common/src/main/java/org/bouncycastle/asn1/DERTags.java similarity index 100% rename from src/org/bouncycastle/asn1/DERTags.java rename to common/src/main/java/org/bouncycastle/asn1/DERTags.java diff --git a/src/org/bouncycastle/asn1/DERUTCTime.java b/common/src/main/java/org/bouncycastle/asn1/DERUTCTime.java similarity index 100% rename from src/org/bouncycastle/asn1/DERUTCTime.java rename to common/src/main/java/org/bouncycastle/asn1/DERUTCTime.java diff --git a/src/org/bouncycastle/asn1/DERUTF8String.java b/common/src/main/java/org/bouncycastle/asn1/DERUTF8String.java similarity index 100% rename from src/org/bouncycastle/asn1/DERUTF8String.java rename to common/src/main/java/org/bouncycastle/asn1/DERUTF8String.java diff --git a/src/org/bouncycastle/asn1/DERUniversalString.java b/common/src/main/java/org/bouncycastle/asn1/DERUniversalString.java similarity index 100% rename from src/org/bouncycastle/asn1/DERUniversalString.java rename to common/src/main/java/org/bouncycastle/asn1/DERUniversalString.java diff --git a/src/org/bouncycastle/asn1/DERVisibleString.java b/common/src/main/java/org/bouncycastle/asn1/DERVisibleString.java similarity index 100% rename from src/org/bouncycastle/asn1/DERVisibleString.java rename to common/src/main/java/org/bouncycastle/asn1/DERVisibleString.java diff --git a/src/org/bouncycastle/asn1/DLOutputStream.java b/common/src/main/java/org/bouncycastle/asn1/DLOutputStream.java similarity index 100% rename from src/org/bouncycastle/asn1/DLOutputStream.java rename to common/src/main/java/org/bouncycastle/asn1/DLOutputStream.java diff --git a/src/org/bouncycastle/asn1/DLSequence.java b/common/src/main/java/org/bouncycastle/asn1/DLSequence.java similarity index 100% rename from src/org/bouncycastle/asn1/DLSequence.java rename to common/src/main/java/org/bouncycastle/asn1/DLSequence.java diff --git a/src/org/bouncycastle/asn1/DLSet.java b/common/src/main/java/org/bouncycastle/asn1/DLSet.java similarity index 100% rename from src/org/bouncycastle/asn1/DLSet.java rename to common/src/main/java/org/bouncycastle/asn1/DLSet.java diff --git a/src/org/bouncycastle/asn1/DLTaggedObject.java b/common/src/main/java/org/bouncycastle/asn1/DLTaggedObject.java similarity index 100% rename from src/org/bouncycastle/asn1/DLTaggedObject.java rename to common/src/main/java/org/bouncycastle/asn1/DLTaggedObject.java diff --git a/src/org/bouncycastle/asn1/DateFormatter.java b/common/src/main/java/org/bouncycastle/asn1/DateFormatter.java similarity index 100% rename from src/org/bouncycastle/asn1/DateFormatter.java rename to common/src/main/java/org/bouncycastle/asn1/DateFormatter.java diff --git a/src/org/bouncycastle/asn1/DefiniteLengthInputStream.java b/common/src/main/java/org/bouncycastle/asn1/DefiniteLengthInputStream.java similarity index 100% rename from src/org/bouncycastle/asn1/DefiniteLengthInputStream.java rename to common/src/main/java/org/bouncycastle/asn1/DefiniteLengthInputStream.java diff --git a/src/org/bouncycastle/asn1/InMemoryRepresentable.java b/common/src/main/java/org/bouncycastle/asn1/InMemoryRepresentable.java similarity index 100% rename from src/org/bouncycastle/asn1/InMemoryRepresentable.java rename to common/src/main/java/org/bouncycastle/asn1/InMemoryRepresentable.java diff --git a/src/org/bouncycastle/asn1/IndefiniteLengthInputStream.java b/common/src/main/java/org/bouncycastle/asn1/IndefiniteLengthInputStream.java similarity index 100% rename from src/org/bouncycastle/asn1/IndefiniteLengthInputStream.java rename to common/src/main/java/org/bouncycastle/asn1/IndefiniteLengthInputStream.java diff --git a/src/org/bouncycastle/asn1/LazyConstructionEnumeration.java b/common/src/main/java/org/bouncycastle/asn1/LazyConstructionEnumeration.java similarity index 100% rename from src/org/bouncycastle/asn1/LazyConstructionEnumeration.java rename to common/src/main/java/org/bouncycastle/asn1/LazyConstructionEnumeration.java diff --git a/src/org/bouncycastle/asn1/LazyEncodedSequence.java b/common/src/main/java/org/bouncycastle/asn1/LazyEncodedSequence.java similarity index 100% rename from src/org/bouncycastle/asn1/LazyEncodedSequence.java rename to common/src/main/java/org/bouncycastle/asn1/LazyEncodedSequence.java diff --git a/src/org/bouncycastle/asn1/LimitedInputStream.java b/common/src/main/java/org/bouncycastle/asn1/LimitedInputStream.java similarity index 100% rename from src/org/bouncycastle/asn1/LimitedInputStream.java rename to common/src/main/java/org/bouncycastle/asn1/LimitedInputStream.java diff --git a/src/org/bouncycastle/asn1/OIDTokenizer.java b/common/src/main/java/org/bouncycastle/asn1/OIDTokenizer.java similarity index 100% rename from src/org/bouncycastle/asn1/OIDTokenizer.java rename to common/src/main/java/org/bouncycastle/asn1/OIDTokenizer.java diff --git a/src/org/bouncycastle/asn1/StreamUtil.java b/common/src/main/java/org/bouncycastle/asn1/StreamUtil.java similarity index 100% rename from src/org/bouncycastle/asn1/StreamUtil.java rename to common/src/main/java/org/bouncycastle/asn1/StreamUtil.java diff --git a/src/org/bouncycastle/asn1/pkcs/Attribute.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/Attribute.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/Attribute.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/Attribute.java diff --git a/src/org/bouncycastle/asn1/pkcs/AuthenticatedSafe.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/AuthenticatedSafe.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/AuthenticatedSafe.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/AuthenticatedSafe.java diff --git a/src/org/bouncycastle/asn1/pkcs/CRLBag.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/CRLBag.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/CRLBag.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/CRLBag.java diff --git a/src/org/bouncycastle/asn1/pkcs/CertBag.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/CertBag.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/CertBag.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/CertBag.java diff --git a/src/org/bouncycastle/asn1/pkcs/CertificationRequest.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/CertificationRequest.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/CertificationRequest.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/CertificationRequest.java diff --git a/src/org/bouncycastle/asn1/pkcs/CertificationRequestInfo.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/CertificationRequestInfo.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/CertificationRequestInfo.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/CertificationRequestInfo.java diff --git a/src/org/bouncycastle/asn1/pkcs/ContentInfo.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/ContentInfo.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/ContentInfo.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/ContentInfo.java diff --git a/src/org/bouncycastle/asn1/pkcs/DHParameter.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/DHParameter.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/DHParameter.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/DHParameter.java diff --git a/src/org/bouncycastle/asn1/pkcs/EncryptedData.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/EncryptedData.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/EncryptedData.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/EncryptedData.java diff --git a/src/org/bouncycastle/asn1/pkcs/EncryptedPrivateKeyInfo.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/EncryptedPrivateKeyInfo.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/EncryptedPrivateKeyInfo.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/EncryptedPrivateKeyInfo.java diff --git a/src/org/bouncycastle/asn1/pkcs/EncryptionScheme.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/EncryptionScheme.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/EncryptionScheme.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/EncryptionScheme.java diff --git a/src/org/bouncycastle/asn1/pkcs/IssuerAndSerialNumber.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/IssuerAndSerialNumber.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/IssuerAndSerialNumber.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/IssuerAndSerialNumber.java diff --git a/src/org/bouncycastle/asn1/pkcs/KeyDerivationFunc.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/KeyDerivationFunc.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/KeyDerivationFunc.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/KeyDerivationFunc.java diff --git a/src/org/bouncycastle/asn1/pkcs/MacData.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/MacData.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java diff --git a/src/org/bouncycastle/asn1/pkcs/PBEParameter.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/PBEParameter.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/PBEParameter.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/PBEParameter.java diff --git a/src/org/bouncycastle/asn1/pkcs/PBES2Algorithms.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/PBES2Algorithms.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/PBES2Algorithms.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/PBES2Algorithms.java diff --git a/src/org/bouncycastle/asn1/pkcs/PBES2Parameters.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/PBES2Parameters.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/PBES2Parameters.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/PBES2Parameters.java diff --git a/src/org/bouncycastle/asn1/pkcs/PBKDF2Params.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/PBKDF2Params.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/PBKDF2Params.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/PBKDF2Params.java diff --git a/src/org/bouncycastle/asn1/pkcs/PKCS12PBEParams.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/PKCS12PBEParams.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/PKCS12PBEParams.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/PKCS12PBEParams.java diff --git a/src/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java diff --git a/src/org/bouncycastle/asn1/pkcs/Pfx.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/Pfx.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/Pfx.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/Pfx.java diff --git a/src/org/bouncycastle/asn1/pkcs/PrivateKeyInfo.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/PrivateKeyInfo.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/PrivateKeyInfo.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/PrivateKeyInfo.java diff --git a/src/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java diff --git a/src/org/bouncycastle/asn1/pkcs/RSAESOAEPparams.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/RSAESOAEPparams.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/RSAESOAEPparams.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/RSAESOAEPparams.java diff --git a/src/org/bouncycastle/asn1/pkcs/RSAPrivateKey.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/RSAPrivateKey.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/RSAPrivateKey.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/RSAPrivateKey.java diff --git a/src/org/bouncycastle/asn1/pkcs/RSAPrivateKeyStructure.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/RSAPrivateKeyStructure.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/RSAPrivateKeyStructure.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/RSAPrivateKeyStructure.java diff --git a/src/org/bouncycastle/asn1/pkcs/RSAPublicKey.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/RSAPublicKey.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/RSAPublicKey.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/RSAPublicKey.java diff --git a/src/org/bouncycastle/asn1/pkcs/RSASSAPSSparams.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/RSASSAPSSparams.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/RSASSAPSSparams.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/RSASSAPSSparams.java diff --git a/src/org/bouncycastle/asn1/pkcs/SafeBag.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/SafeBag.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/SafeBag.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/SafeBag.java diff --git a/src/org/bouncycastle/asn1/pkcs/SignedData.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/SignedData.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/SignedData.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/SignedData.java diff --git a/src/org/bouncycastle/asn1/pkcs/SignerInfo.java b/common/src/main/java/org/bouncycastle/asn1/pkcs/SignerInfo.java similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/SignerInfo.java rename to common/src/main/java/org/bouncycastle/asn1/pkcs/SignerInfo.java diff --git a/src/org/bouncycastle/asn1/sec/ECPrivateKey.java b/common/src/main/java/org/bouncycastle/asn1/sec/ECPrivateKey.java similarity index 100% rename from src/org/bouncycastle/asn1/sec/ECPrivateKey.java rename to common/src/main/java/org/bouncycastle/asn1/sec/ECPrivateKey.java diff --git a/src/org/bouncycastle/asn1/sec/ECPrivateKeyStructure.java b/common/src/main/java/org/bouncycastle/asn1/sec/ECPrivateKeyStructure.java similarity index 100% rename from src/org/bouncycastle/asn1/sec/ECPrivateKeyStructure.java rename to common/src/main/java/org/bouncycastle/asn1/sec/ECPrivateKeyStructure.java diff --git a/src/org/bouncycastle/asn1/sec/SECNamedCurves.java b/common/src/main/java/org/bouncycastle/asn1/sec/SECNamedCurves.java similarity index 100% rename from src/org/bouncycastle/asn1/sec/SECNamedCurves.java rename to common/src/main/java/org/bouncycastle/asn1/sec/SECNamedCurves.java diff --git a/src/org/bouncycastle/asn1/sec/SECObjectIdentifiers.java b/common/src/main/java/org/bouncycastle/asn1/sec/SECObjectIdentifiers.java similarity index 100% rename from src/org/bouncycastle/asn1/sec/SECObjectIdentifiers.java rename to common/src/main/java/org/bouncycastle/asn1/sec/SECObjectIdentifiers.java diff --git a/src/org/bouncycastle/asn1/util/ASN1Dump.java b/common/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java similarity index 100% rename from src/org/bouncycastle/asn1/util/ASN1Dump.java rename to common/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java diff --git a/src/org/bouncycastle/asn1/util/DERDump.java b/common/src/main/java/org/bouncycastle/asn1/util/DERDump.java similarity index 100% rename from src/org/bouncycastle/asn1/util/DERDump.java rename to common/src/main/java/org/bouncycastle/asn1/util/DERDump.java diff --git a/src/org/bouncycastle/asn1/x500/AttributeTypeAndValue.java b/common/src/main/java/org/bouncycastle/asn1/x500/AttributeTypeAndValue.java similarity index 100% rename from src/org/bouncycastle/asn1/x500/AttributeTypeAndValue.java rename to common/src/main/java/org/bouncycastle/asn1/x500/AttributeTypeAndValue.java diff --git a/src/org/bouncycastle/asn1/x500/DirectoryString.java b/common/src/main/java/org/bouncycastle/asn1/x500/DirectoryString.java similarity index 100% rename from src/org/bouncycastle/asn1/x500/DirectoryString.java rename to common/src/main/java/org/bouncycastle/asn1/x500/DirectoryString.java diff --git a/src/org/bouncycastle/asn1/x500/RDN.java b/common/src/main/java/org/bouncycastle/asn1/x500/RDN.java similarity index 100% rename from src/org/bouncycastle/asn1/x500/RDN.java rename to common/src/main/java/org/bouncycastle/asn1/x500/RDN.java diff --git a/src/org/bouncycastle/asn1/x500/X500Name.java b/common/src/main/java/org/bouncycastle/asn1/x500/X500Name.java similarity index 100% rename from src/org/bouncycastle/asn1/x500/X500Name.java rename to common/src/main/java/org/bouncycastle/asn1/x500/X500Name.java diff --git a/src/org/bouncycastle/asn1/x500/X500NameBuilder.java b/common/src/main/java/org/bouncycastle/asn1/x500/X500NameBuilder.java similarity index 100% rename from src/org/bouncycastle/asn1/x500/X500NameBuilder.java rename to common/src/main/java/org/bouncycastle/asn1/x500/X500NameBuilder.java diff --git a/src/org/bouncycastle/asn1/x500/X500NameStyle.java b/common/src/main/java/org/bouncycastle/asn1/x500/X500NameStyle.java similarity index 100% rename from src/org/bouncycastle/asn1/x500/X500NameStyle.java rename to common/src/main/java/org/bouncycastle/asn1/x500/X500NameStyle.java diff --git a/src/org/bouncycastle/asn1/x500/style/BCStrictStyle.java b/common/src/main/java/org/bouncycastle/asn1/x500/style/BCStrictStyle.java similarity index 100% rename from src/org/bouncycastle/asn1/x500/style/BCStrictStyle.java rename to common/src/main/java/org/bouncycastle/asn1/x500/style/BCStrictStyle.java diff --git a/src/org/bouncycastle/asn1/x500/style/BCStyle.java b/common/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java similarity index 100% rename from src/org/bouncycastle/asn1/x500/style/BCStyle.java rename to common/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java diff --git a/src/org/bouncycastle/asn1/x500/style/IETFUtils.java b/common/src/main/java/org/bouncycastle/asn1/x500/style/IETFUtils.java similarity index 100% rename from src/org/bouncycastle/asn1/x500/style/IETFUtils.java rename to common/src/main/java/org/bouncycastle/asn1/x500/style/IETFUtils.java diff --git a/src/org/bouncycastle/asn1/x500/style/RFC4519Style.java b/common/src/main/java/org/bouncycastle/asn1/x500/style/RFC4519Style.java similarity index 100% rename from src/org/bouncycastle/asn1/x500/style/RFC4519Style.java rename to common/src/main/java/org/bouncycastle/asn1/x500/style/RFC4519Style.java diff --git a/src/org/bouncycastle/asn1/x500/style/X500NameTokenizer.java b/common/src/main/java/org/bouncycastle/asn1/x500/style/X500NameTokenizer.java similarity index 100% rename from src/org/bouncycastle/asn1/x500/style/X500NameTokenizer.java rename to common/src/main/java/org/bouncycastle/asn1/x500/style/X500NameTokenizer.java diff --git a/src/org/bouncycastle/asn1/x509/AccessDescription.java b/common/src/main/java/org/bouncycastle/asn1/x509/AccessDescription.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/AccessDescription.java rename to common/src/main/java/org/bouncycastle/asn1/x509/AccessDescription.java diff --git a/src/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java b/common/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java rename to common/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java diff --git a/src/org/bouncycastle/asn1/x509/AttCertIssuer.java b/common/src/main/java/org/bouncycastle/asn1/x509/AttCertIssuer.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/AttCertIssuer.java rename to common/src/main/java/org/bouncycastle/asn1/x509/AttCertIssuer.java diff --git a/src/org/bouncycastle/asn1/x509/AttCertValidityPeriod.java b/common/src/main/java/org/bouncycastle/asn1/x509/AttCertValidityPeriod.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/AttCertValidityPeriod.java rename to common/src/main/java/org/bouncycastle/asn1/x509/AttCertValidityPeriod.java diff --git a/src/org/bouncycastle/asn1/x509/Attribute.java b/common/src/main/java/org/bouncycastle/asn1/x509/Attribute.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/Attribute.java rename to common/src/main/java/org/bouncycastle/asn1/x509/Attribute.java diff --git a/src/org/bouncycastle/asn1/x509/AttributeCertificate.java b/common/src/main/java/org/bouncycastle/asn1/x509/AttributeCertificate.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/AttributeCertificate.java rename to common/src/main/java/org/bouncycastle/asn1/x509/AttributeCertificate.java diff --git a/src/org/bouncycastle/asn1/x509/AttributeCertificateInfo.java b/common/src/main/java/org/bouncycastle/asn1/x509/AttributeCertificateInfo.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/AttributeCertificateInfo.java rename to common/src/main/java/org/bouncycastle/asn1/x509/AttributeCertificateInfo.java diff --git a/src/org/bouncycastle/asn1/x509/AuthorityInformationAccess.java b/common/src/main/java/org/bouncycastle/asn1/x509/AuthorityInformationAccess.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/AuthorityInformationAccess.java rename to common/src/main/java/org/bouncycastle/asn1/x509/AuthorityInformationAccess.java diff --git a/src/org/bouncycastle/asn1/x509/AuthorityKeyIdentifier.java b/common/src/main/java/org/bouncycastle/asn1/x509/AuthorityKeyIdentifier.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/AuthorityKeyIdentifier.java rename to common/src/main/java/org/bouncycastle/asn1/x509/AuthorityKeyIdentifier.java diff --git a/src/org/bouncycastle/asn1/x509/BasicConstraints.java b/common/src/main/java/org/bouncycastle/asn1/x509/BasicConstraints.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/BasicConstraints.java rename to common/src/main/java/org/bouncycastle/asn1/x509/BasicConstraints.java diff --git a/src/org/bouncycastle/asn1/x509/CRLDistPoint.java b/common/src/main/java/org/bouncycastle/asn1/x509/CRLDistPoint.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/CRLDistPoint.java rename to common/src/main/java/org/bouncycastle/asn1/x509/CRLDistPoint.java diff --git a/src/org/bouncycastle/asn1/x509/CRLNumber.java b/common/src/main/java/org/bouncycastle/asn1/x509/CRLNumber.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/CRLNumber.java rename to common/src/main/java/org/bouncycastle/asn1/x509/CRLNumber.java diff --git a/src/org/bouncycastle/asn1/x509/CRLReason.java b/common/src/main/java/org/bouncycastle/asn1/x509/CRLReason.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/CRLReason.java rename to common/src/main/java/org/bouncycastle/asn1/x509/CRLReason.java diff --git a/src/org/bouncycastle/asn1/x509/CertPolicyId.java b/common/src/main/java/org/bouncycastle/asn1/x509/CertPolicyId.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/CertPolicyId.java rename to common/src/main/java/org/bouncycastle/asn1/x509/CertPolicyId.java diff --git a/src/org/bouncycastle/asn1/x509/Certificate.java b/common/src/main/java/org/bouncycastle/asn1/x509/Certificate.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/Certificate.java rename to common/src/main/java/org/bouncycastle/asn1/x509/Certificate.java diff --git a/src/org/bouncycastle/asn1/x509/CertificateList.java b/common/src/main/java/org/bouncycastle/asn1/x509/CertificateList.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/CertificateList.java rename to common/src/main/java/org/bouncycastle/asn1/x509/CertificateList.java diff --git a/src/org/bouncycastle/asn1/x509/CertificatePair.java b/common/src/main/java/org/bouncycastle/asn1/x509/CertificatePair.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/CertificatePair.java rename to common/src/main/java/org/bouncycastle/asn1/x509/CertificatePair.java diff --git a/src/org/bouncycastle/asn1/x509/CertificatePolicies.java b/common/src/main/java/org/bouncycastle/asn1/x509/CertificatePolicies.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/CertificatePolicies.java rename to common/src/main/java/org/bouncycastle/asn1/x509/CertificatePolicies.java diff --git a/src/org/bouncycastle/asn1/x509/DSAParameter.java b/common/src/main/java/org/bouncycastle/asn1/x509/DSAParameter.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/DSAParameter.java rename to common/src/main/java/org/bouncycastle/asn1/x509/DSAParameter.java diff --git a/src/org/bouncycastle/asn1/x509/DigestInfo.java b/common/src/main/java/org/bouncycastle/asn1/x509/DigestInfo.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/DigestInfo.java rename to common/src/main/java/org/bouncycastle/asn1/x509/DigestInfo.java diff --git a/src/org/bouncycastle/asn1/x509/DisplayText.java b/common/src/main/java/org/bouncycastle/asn1/x509/DisplayText.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/DisplayText.java rename to common/src/main/java/org/bouncycastle/asn1/x509/DisplayText.java diff --git a/src/org/bouncycastle/asn1/x509/DistributionPoint.java b/common/src/main/java/org/bouncycastle/asn1/x509/DistributionPoint.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/DistributionPoint.java rename to common/src/main/java/org/bouncycastle/asn1/x509/DistributionPoint.java diff --git a/src/org/bouncycastle/asn1/x509/DistributionPointName.java b/common/src/main/java/org/bouncycastle/asn1/x509/DistributionPointName.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/DistributionPointName.java rename to common/src/main/java/org/bouncycastle/asn1/x509/DistributionPointName.java diff --git a/src/org/bouncycastle/asn1/x509/ExtendedKeyUsage.java b/common/src/main/java/org/bouncycastle/asn1/x509/ExtendedKeyUsage.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/ExtendedKeyUsage.java rename to common/src/main/java/org/bouncycastle/asn1/x509/ExtendedKeyUsage.java diff --git a/src/org/bouncycastle/asn1/x509/Extension.java b/common/src/main/java/org/bouncycastle/asn1/x509/Extension.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/Extension.java rename to common/src/main/java/org/bouncycastle/asn1/x509/Extension.java diff --git a/src/org/bouncycastle/asn1/x509/Extensions.java b/common/src/main/java/org/bouncycastle/asn1/x509/Extensions.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/Extensions.java rename to common/src/main/java/org/bouncycastle/asn1/x509/Extensions.java diff --git a/src/org/bouncycastle/asn1/x509/ExtensionsGenerator.java b/common/src/main/java/org/bouncycastle/asn1/x509/ExtensionsGenerator.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/ExtensionsGenerator.java rename to common/src/main/java/org/bouncycastle/asn1/x509/ExtensionsGenerator.java diff --git a/src/org/bouncycastle/asn1/x509/GeneralName.java b/common/src/main/java/org/bouncycastle/asn1/x509/GeneralName.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/GeneralName.java rename to common/src/main/java/org/bouncycastle/asn1/x509/GeneralName.java diff --git a/src/org/bouncycastle/asn1/x509/GeneralNames.java b/common/src/main/java/org/bouncycastle/asn1/x509/GeneralNames.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/GeneralNames.java rename to common/src/main/java/org/bouncycastle/asn1/x509/GeneralNames.java diff --git a/src/org/bouncycastle/asn1/x509/GeneralSubtree.java b/common/src/main/java/org/bouncycastle/asn1/x509/GeneralSubtree.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/GeneralSubtree.java rename to common/src/main/java/org/bouncycastle/asn1/x509/GeneralSubtree.java diff --git a/src/org/bouncycastle/asn1/x509/Holder.java b/common/src/main/java/org/bouncycastle/asn1/x509/Holder.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/Holder.java rename to common/src/main/java/org/bouncycastle/asn1/x509/Holder.java diff --git a/src/org/bouncycastle/asn1/x509/IetfAttrSyntax.java b/common/src/main/java/org/bouncycastle/asn1/x509/IetfAttrSyntax.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/IetfAttrSyntax.java rename to common/src/main/java/org/bouncycastle/asn1/x509/IetfAttrSyntax.java diff --git a/src/org/bouncycastle/asn1/x509/IssuerSerial.java b/common/src/main/java/org/bouncycastle/asn1/x509/IssuerSerial.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/IssuerSerial.java rename to common/src/main/java/org/bouncycastle/asn1/x509/IssuerSerial.java diff --git a/src/org/bouncycastle/asn1/x509/IssuingDistributionPoint.java b/common/src/main/java/org/bouncycastle/asn1/x509/IssuingDistributionPoint.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/IssuingDistributionPoint.java rename to common/src/main/java/org/bouncycastle/asn1/x509/IssuingDistributionPoint.java diff --git a/src/org/bouncycastle/asn1/x509/KeyPurposeId.java b/common/src/main/java/org/bouncycastle/asn1/x509/KeyPurposeId.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/KeyPurposeId.java rename to common/src/main/java/org/bouncycastle/asn1/x509/KeyPurposeId.java diff --git a/src/org/bouncycastle/asn1/x509/KeyUsage.java b/common/src/main/java/org/bouncycastle/asn1/x509/KeyUsage.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/KeyUsage.java rename to common/src/main/java/org/bouncycastle/asn1/x509/KeyUsage.java diff --git a/src/org/bouncycastle/asn1/x509/NameConstraints.java b/common/src/main/java/org/bouncycastle/asn1/x509/NameConstraints.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/NameConstraints.java rename to common/src/main/java/org/bouncycastle/asn1/x509/NameConstraints.java diff --git a/src/org/bouncycastle/asn1/x509/NoticeReference.java b/common/src/main/java/org/bouncycastle/asn1/x509/NoticeReference.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/NoticeReference.java rename to common/src/main/java/org/bouncycastle/asn1/x509/NoticeReference.java diff --git a/src/org/bouncycastle/asn1/x509/ObjectDigestInfo.java b/common/src/main/java/org/bouncycastle/asn1/x509/ObjectDigestInfo.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/ObjectDigestInfo.java rename to common/src/main/java/org/bouncycastle/asn1/x509/ObjectDigestInfo.java diff --git a/src/org/bouncycastle/asn1/x509/PolicyInformation.java b/common/src/main/java/org/bouncycastle/asn1/x509/PolicyInformation.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/PolicyInformation.java rename to common/src/main/java/org/bouncycastle/asn1/x509/PolicyInformation.java diff --git a/src/org/bouncycastle/asn1/x509/PolicyMappings.java b/common/src/main/java/org/bouncycastle/asn1/x509/PolicyMappings.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/PolicyMappings.java rename to common/src/main/java/org/bouncycastle/asn1/x509/PolicyMappings.java diff --git a/src/org/bouncycastle/asn1/x509/PolicyQualifierId.java b/common/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierId.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/PolicyQualifierId.java rename to common/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierId.java diff --git a/src/org/bouncycastle/asn1/x509/PolicyQualifierInfo.java b/common/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierInfo.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/PolicyQualifierInfo.java rename to common/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierInfo.java diff --git a/src/org/bouncycastle/asn1/x509/PrivateKeyUsagePeriod.java b/common/src/main/java/org/bouncycastle/asn1/x509/PrivateKeyUsagePeriod.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/PrivateKeyUsagePeriod.java rename to common/src/main/java/org/bouncycastle/asn1/x509/PrivateKeyUsagePeriod.java diff --git a/src/org/bouncycastle/asn1/x509/RSAPublicKeyStructure.java b/common/src/main/java/org/bouncycastle/asn1/x509/RSAPublicKeyStructure.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/RSAPublicKeyStructure.java rename to common/src/main/java/org/bouncycastle/asn1/x509/RSAPublicKeyStructure.java diff --git a/src/org/bouncycastle/asn1/x509/ReasonFlags.java b/common/src/main/java/org/bouncycastle/asn1/x509/ReasonFlags.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/ReasonFlags.java rename to common/src/main/java/org/bouncycastle/asn1/x509/ReasonFlags.java diff --git a/src/org/bouncycastle/asn1/x509/RoleSyntax.java b/common/src/main/java/org/bouncycastle/asn1/x509/RoleSyntax.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/RoleSyntax.java rename to common/src/main/java/org/bouncycastle/asn1/x509/RoleSyntax.java diff --git a/src/org/bouncycastle/asn1/x509/SubjectDirectoryAttributes.java b/common/src/main/java/org/bouncycastle/asn1/x509/SubjectDirectoryAttributes.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/SubjectDirectoryAttributes.java rename to common/src/main/java/org/bouncycastle/asn1/x509/SubjectDirectoryAttributes.java diff --git a/src/org/bouncycastle/asn1/x509/SubjectKeyIdentifier.java b/common/src/main/java/org/bouncycastle/asn1/x509/SubjectKeyIdentifier.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/SubjectKeyIdentifier.java rename to common/src/main/java/org/bouncycastle/asn1/x509/SubjectKeyIdentifier.java diff --git a/src/org/bouncycastle/asn1/x509/SubjectPublicKeyInfo.java b/common/src/main/java/org/bouncycastle/asn1/x509/SubjectPublicKeyInfo.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/SubjectPublicKeyInfo.java rename to common/src/main/java/org/bouncycastle/asn1/x509/SubjectPublicKeyInfo.java diff --git a/src/org/bouncycastle/asn1/x509/TBSCertList.java b/common/src/main/java/org/bouncycastle/asn1/x509/TBSCertList.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/TBSCertList.java rename to common/src/main/java/org/bouncycastle/asn1/x509/TBSCertList.java diff --git a/src/org/bouncycastle/asn1/x509/TBSCertificate.java b/common/src/main/java/org/bouncycastle/asn1/x509/TBSCertificate.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/TBSCertificate.java rename to common/src/main/java/org/bouncycastle/asn1/x509/TBSCertificate.java diff --git a/src/org/bouncycastle/asn1/x509/TBSCertificateStructure.java b/common/src/main/java/org/bouncycastle/asn1/x509/TBSCertificateStructure.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/TBSCertificateStructure.java rename to common/src/main/java/org/bouncycastle/asn1/x509/TBSCertificateStructure.java diff --git a/src/org/bouncycastle/asn1/x509/Target.java b/common/src/main/java/org/bouncycastle/asn1/x509/Target.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/Target.java rename to common/src/main/java/org/bouncycastle/asn1/x509/Target.java diff --git a/src/org/bouncycastle/asn1/x509/TargetInformation.java b/common/src/main/java/org/bouncycastle/asn1/x509/TargetInformation.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/TargetInformation.java rename to common/src/main/java/org/bouncycastle/asn1/x509/TargetInformation.java diff --git a/src/org/bouncycastle/asn1/x509/Targets.java b/common/src/main/java/org/bouncycastle/asn1/x509/Targets.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/Targets.java rename to common/src/main/java/org/bouncycastle/asn1/x509/Targets.java diff --git a/src/org/bouncycastle/asn1/x509/Time.java b/common/src/main/java/org/bouncycastle/asn1/x509/Time.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/Time.java rename to common/src/main/java/org/bouncycastle/asn1/x509/Time.java diff --git a/src/org/bouncycastle/asn1/x509/UserNotice.java b/common/src/main/java/org/bouncycastle/asn1/x509/UserNotice.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/UserNotice.java rename to common/src/main/java/org/bouncycastle/asn1/x509/UserNotice.java diff --git a/src/org/bouncycastle/asn1/x509/V1TBSCertificateGenerator.java b/common/src/main/java/org/bouncycastle/asn1/x509/V1TBSCertificateGenerator.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/V1TBSCertificateGenerator.java rename to common/src/main/java/org/bouncycastle/asn1/x509/V1TBSCertificateGenerator.java diff --git a/src/org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java b/common/src/main/java/org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java rename to common/src/main/java/org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java diff --git a/src/org/bouncycastle/asn1/x509/V2Form.java b/common/src/main/java/org/bouncycastle/asn1/x509/V2Form.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/V2Form.java rename to common/src/main/java/org/bouncycastle/asn1/x509/V2Form.java diff --git a/src/org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java b/common/src/main/java/org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java rename to common/src/main/java/org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java diff --git a/src/org/bouncycastle/asn1/x509/V3TBSCertificateGenerator.java b/common/src/main/java/org/bouncycastle/asn1/x509/V3TBSCertificateGenerator.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/V3TBSCertificateGenerator.java rename to common/src/main/java/org/bouncycastle/asn1/x509/V3TBSCertificateGenerator.java diff --git a/src/org/bouncycastle/asn1/x509/X509AttributeIdentifiers.java b/common/src/main/java/org/bouncycastle/asn1/x509/X509AttributeIdentifiers.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/X509AttributeIdentifiers.java rename to common/src/main/java/org/bouncycastle/asn1/x509/X509AttributeIdentifiers.java diff --git a/src/org/bouncycastle/asn1/x509/X509CertificateStructure.java b/common/src/main/java/org/bouncycastle/asn1/x509/X509CertificateStructure.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/X509CertificateStructure.java rename to common/src/main/java/org/bouncycastle/asn1/x509/X509CertificateStructure.java diff --git a/src/org/bouncycastle/asn1/x509/X509DefaultEntryConverter.java b/common/src/main/java/org/bouncycastle/asn1/x509/X509DefaultEntryConverter.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/X509DefaultEntryConverter.java rename to common/src/main/java/org/bouncycastle/asn1/x509/X509DefaultEntryConverter.java diff --git a/src/org/bouncycastle/asn1/x509/X509Extension.java b/common/src/main/java/org/bouncycastle/asn1/x509/X509Extension.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/X509Extension.java rename to common/src/main/java/org/bouncycastle/asn1/x509/X509Extension.java diff --git a/src/org/bouncycastle/asn1/x509/X509Extensions.java b/common/src/main/java/org/bouncycastle/asn1/x509/X509Extensions.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/X509Extensions.java rename to common/src/main/java/org/bouncycastle/asn1/x509/X509Extensions.java diff --git a/src/org/bouncycastle/asn1/x509/X509ExtensionsGenerator.java b/common/src/main/java/org/bouncycastle/asn1/x509/X509ExtensionsGenerator.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/X509ExtensionsGenerator.java rename to common/src/main/java/org/bouncycastle/asn1/x509/X509ExtensionsGenerator.java diff --git a/src/org/bouncycastle/asn1/x509/X509Name.java b/common/src/main/java/org/bouncycastle/asn1/x509/X509Name.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/X509Name.java rename to common/src/main/java/org/bouncycastle/asn1/x509/X509Name.java diff --git a/src/org/bouncycastle/asn1/x509/X509NameEntryConverter.java b/common/src/main/java/org/bouncycastle/asn1/x509/X509NameEntryConverter.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/X509NameEntryConverter.java rename to common/src/main/java/org/bouncycastle/asn1/x509/X509NameEntryConverter.java diff --git a/src/org/bouncycastle/asn1/x509/X509NameTokenizer.java b/common/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/X509NameTokenizer.java rename to common/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java diff --git a/src/org/bouncycastle/asn1/x509/X509ObjectIdentifiers.java b/common/src/main/java/org/bouncycastle/asn1/x509/X509ObjectIdentifiers.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/X509ObjectIdentifiers.java rename to common/src/main/java/org/bouncycastle/asn1/x509/X509ObjectIdentifiers.java diff --git a/src/org/bouncycastle/asn1/x509/qualified/BiometricData.java b/common/src/main/java/org/bouncycastle/asn1/x509/qualified/BiometricData.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/qualified/BiometricData.java rename to common/src/main/java/org/bouncycastle/asn1/x509/qualified/BiometricData.java diff --git a/src/org/bouncycastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.java b/common/src/main/java/org/bouncycastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.java rename to common/src/main/java/org/bouncycastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.java diff --git a/src/org/bouncycastle/asn1/x509/qualified/Iso4217CurrencyCode.java b/common/src/main/java/org/bouncycastle/asn1/x509/qualified/Iso4217CurrencyCode.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/qualified/Iso4217CurrencyCode.java rename to common/src/main/java/org/bouncycastle/asn1/x509/qualified/Iso4217CurrencyCode.java diff --git a/src/org/bouncycastle/asn1/x509/qualified/MonetaryValue.java b/common/src/main/java/org/bouncycastle/asn1/x509/qualified/MonetaryValue.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/qualified/MonetaryValue.java rename to common/src/main/java/org/bouncycastle/asn1/x509/qualified/MonetaryValue.java diff --git a/src/org/bouncycastle/asn1/x509/qualified/QCStatement.java b/common/src/main/java/org/bouncycastle/asn1/x509/qualified/QCStatement.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/qualified/QCStatement.java rename to common/src/main/java/org/bouncycastle/asn1/x509/qualified/QCStatement.java diff --git a/src/org/bouncycastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.java b/common/src/main/java/org/bouncycastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.java rename to common/src/main/java/org/bouncycastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.java diff --git a/src/org/bouncycastle/asn1/x509/qualified/SemanticsInformation.java b/common/src/main/java/org/bouncycastle/asn1/x509/qualified/SemanticsInformation.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/qualified/SemanticsInformation.java rename to common/src/main/java/org/bouncycastle/asn1/x509/qualified/SemanticsInformation.java diff --git a/src/org/bouncycastle/asn1/x509/qualified/TypeOfBiometricData.java b/common/src/main/java/org/bouncycastle/asn1/x509/qualified/TypeOfBiometricData.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/qualified/TypeOfBiometricData.java rename to common/src/main/java/org/bouncycastle/asn1/x509/qualified/TypeOfBiometricData.java diff --git a/src/org/bouncycastle/asn1/x509/sigi/NameOrPseudonym.java b/common/src/main/java/org/bouncycastle/asn1/x509/sigi/NameOrPseudonym.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/sigi/NameOrPseudonym.java rename to common/src/main/java/org/bouncycastle/asn1/x509/sigi/NameOrPseudonym.java diff --git a/src/org/bouncycastle/asn1/x509/sigi/PersonalData.java b/common/src/main/java/org/bouncycastle/asn1/x509/sigi/PersonalData.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/sigi/PersonalData.java rename to common/src/main/java/org/bouncycastle/asn1/x509/sigi/PersonalData.java diff --git a/src/org/bouncycastle/asn1/x509/sigi/SigIObjectIdentifiers.java b/common/src/main/java/org/bouncycastle/asn1/x509/sigi/SigIObjectIdentifiers.java similarity index 100% rename from src/org/bouncycastle/asn1/x509/sigi/SigIObjectIdentifiers.java rename to common/src/main/java/org/bouncycastle/asn1/x509/sigi/SigIObjectIdentifiers.java diff --git a/src/org/bouncycastle/asn1/x9/DHDomainParameters.java b/common/src/main/java/org/bouncycastle/asn1/x9/DHDomainParameters.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/DHDomainParameters.java rename to common/src/main/java/org/bouncycastle/asn1/x9/DHDomainParameters.java diff --git a/src/org/bouncycastle/asn1/x9/DHPublicKey.java b/common/src/main/java/org/bouncycastle/asn1/x9/DHPublicKey.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/DHPublicKey.java rename to common/src/main/java/org/bouncycastle/asn1/x9/DHPublicKey.java diff --git a/src/org/bouncycastle/asn1/x9/DHValidationParms.java b/common/src/main/java/org/bouncycastle/asn1/x9/DHValidationParms.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/DHValidationParms.java rename to common/src/main/java/org/bouncycastle/asn1/x9/DHValidationParms.java diff --git a/src/org/bouncycastle/asn1/x9/KeySpecificInfo.java b/common/src/main/java/org/bouncycastle/asn1/x9/KeySpecificInfo.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/KeySpecificInfo.java rename to common/src/main/java/org/bouncycastle/asn1/x9/KeySpecificInfo.java diff --git a/src/org/bouncycastle/asn1/x9/OtherInfo.java b/common/src/main/java/org/bouncycastle/asn1/x9/OtherInfo.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/OtherInfo.java rename to common/src/main/java/org/bouncycastle/asn1/x9/OtherInfo.java diff --git a/src/org/bouncycastle/asn1/x9/X962NamedCurves.java b/common/src/main/java/org/bouncycastle/asn1/x9/X962NamedCurves.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/X962NamedCurves.java rename to common/src/main/java/org/bouncycastle/asn1/x9/X962NamedCurves.java diff --git a/src/org/bouncycastle/asn1/x9/X962Parameters.java b/common/src/main/java/org/bouncycastle/asn1/x9/X962Parameters.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/X962Parameters.java rename to common/src/main/java/org/bouncycastle/asn1/x9/X962Parameters.java diff --git a/src/org/bouncycastle/asn1/x9/X9Curve.java b/common/src/main/java/org/bouncycastle/asn1/x9/X9Curve.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/X9Curve.java rename to common/src/main/java/org/bouncycastle/asn1/x9/X9Curve.java diff --git a/src/org/bouncycastle/asn1/x9/X9ECParameters.java b/common/src/main/java/org/bouncycastle/asn1/x9/X9ECParameters.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/X9ECParameters.java rename to common/src/main/java/org/bouncycastle/asn1/x9/X9ECParameters.java diff --git a/src/org/bouncycastle/asn1/x9/X9ECParametersHolder.java b/common/src/main/java/org/bouncycastle/asn1/x9/X9ECParametersHolder.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/X9ECParametersHolder.java rename to common/src/main/java/org/bouncycastle/asn1/x9/X9ECParametersHolder.java diff --git a/src/org/bouncycastle/asn1/x9/X9ECPoint.java b/common/src/main/java/org/bouncycastle/asn1/x9/X9ECPoint.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/X9ECPoint.java rename to common/src/main/java/org/bouncycastle/asn1/x9/X9ECPoint.java diff --git a/src/org/bouncycastle/asn1/x9/X9FieldElement.java b/common/src/main/java/org/bouncycastle/asn1/x9/X9FieldElement.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/X9FieldElement.java rename to common/src/main/java/org/bouncycastle/asn1/x9/X9FieldElement.java diff --git a/src/org/bouncycastle/asn1/x9/X9FieldID.java b/common/src/main/java/org/bouncycastle/asn1/x9/X9FieldID.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/X9FieldID.java rename to common/src/main/java/org/bouncycastle/asn1/x9/X9FieldID.java diff --git a/src/org/bouncycastle/asn1/x9/X9IntegerConverter.java b/common/src/main/java/org/bouncycastle/asn1/x9/X9IntegerConverter.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/X9IntegerConverter.java rename to common/src/main/java/org/bouncycastle/asn1/x9/X9IntegerConverter.java diff --git a/src/org/bouncycastle/asn1/x9/X9ObjectIdentifiers.java b/common/src/main/java/org/bouncycastle/asn1/x9/X9ObjectIdentifiers.java similarity index 100% rename from src/org/bouncycastle/asn1/x9/X9ObjectIdentifiers.java rename to common/src/main/java/org/bouncycastle/asn1/x9/X9ObjectIdentifiers.java diff --git a/src/org/bouncycastle/crypto/AsymmetricBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/AsymmetricBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/AsymmetricBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/AsymmetricBlockCipher.java diff --git a/src/org/bouncycastle/crypto/AsymmetricCipherKeyPair.java b/common/src/main/java/org/bouncycastle/crypto/AsymmetricCipherKeyPair.java similarity index 100% rename from src/org/bouncycastle/crypto/AsymmetricCipherKeyPair.java rename to common/src/main/java/org/bouncycastle/crypto/AsymmetricCipherKeyPair.java diff --git a/src/org/bouncycastle/crypto/AsymmetricCipherKeyPairGenerator.java b/common/src/main/java/org/bouncycastle/crypto/AsymmetricCipherKeyPairGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/AsymmetricCipherKeyPairGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/AsymmetricCipherKeyPairGenerator.java diff --git a/src/org/bouncycastle/crypto/BasicAgreement.java b/common/src/main/java/org/bouncycastle/crypto/BasicAgreement.java similarity index 100% rename from src/org/bouncycastle/crypto/BasicAgreement.java rename to common/src/main/java/org/bouncycastle/crypto/BasicAgreement.java diff --git a/src/org/bouncycastle/crypto/BlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/BlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/BlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/BlockCipher.java diff --git a/src/org/bouncycastle/crypto/BufferedAsymmetricBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/BufferedAsymmetricBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/BufferedAsymmetricBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/BufferedAsymmetricBlockCipher.java diff --git a/src/org/bouncycastle/crypto/BufferedBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/BufferedBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/BufferedBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/BufferedBlockCipher.java diff --git a/src/org/bouncycastle/crypto/CipherKeyGenerator.java b/common/src/main/java/org/bouncycastle/crypto/CipherKeyGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/CipherKeyGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/CipherKeyGenerator.java diff --git a/src/org/bouncycastle/crypto/CipherParameters.java b/common/src/main/java/org/bouncycastle/crypto/CipherParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/CipherParameters.java rename to common/src/main/java/org/bouncycastle/crypto/CipherParameters.java diff --git a/src/org/bouncycastle/crypto/CryptoException.java b/common/src/main/java/org/bouncycastle/crypto/CryptoException.java similarity index 100% rename from src/org/bouncycastle/crypto/CryptoException.java rename to common/src/main/java/org/bouncycastle/crypto/CryptoException.java diff --git a/src/org/bouncycastle/crypto/DSA.java b/common/src/main/java/org/bouncycastle/crypto/DSA.java similarity index 100% rename from src/org/bouncycastle/crypto/DSA.java rename to common/src/main/java/org/bouncycastle/crypto/DSA.java diff --git a/src/org/bouncycastle/crypto/DataLengthException.java b/common/src/main/java/org/bouncycastle/crypto/DataLengthException.java similarity index 100% rename from src/org/bouncycastle/crypto/DataLengthException.java rename to common/src/main/java/org/bouncycastle/crypto/DataLengthException.java diff --git a/src/org/bouncycastle/crypto/DerivationFunction.java b/common/src/main/java/org/bouncycastle/crypto/DerivationFunction.java similarity index 100% rename from src/org/bouncycastle/crypto/DerivationFunction.java rename to common/src/main/java/org/bouncycastle/crypto/DerivationFunction.java diff --git a/src/org/bouncycastle/crypto/DerivationParameters.java b/common/src/main/java/org/bouncycastle/crypto/DerivationParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/DerivationParameters.java rename to common/src/main/java/org/bouncycastle/crypto/DerivationParameters.java diff --git a/src/org/bouncycastle/crypto/Digest.java b/common/src/main/java/org/bouncycastle/crypto/Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/Digest.java rename to common/src/main/java/org/bouncycastle/crypto/Digest.java diff --git a/src/org/bouncycastle/crypto/ExtendedDigest.java b/common/src/main/java/org/bouncycastle/crypto/ExtendedDigest.java similarity index 100% rename from src/org/bouncycastle/crypto/ExtendedDigest.java rename to common/src/main/java/org/bouncycastle/crypto/ExtendedDigest.java diff --git a/src/org/bouncycastle/crypto/InvalidCipherTextException.java b/common/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java similarity index 100% rename from src/org/bouncycastle/crypto/InvalidCipherTextException.java rename to common/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java diff --git a/src/org/bouncycastle/crypto/KeyGenerationParameters.java b/common/src/main/java/org/bouncycastle/crypto/KeyGenerationParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/KeyGenerationParameters.java rename to common/src/main/java/org/bouncycastle/crypto/KeyGenerationParameters.java diff --git a/src/org/bouncycastle/crypto/Mac.java b/common/src/main/java/org/bouncycastle/crypto/Mac.java similarity index 100% rename from src/org/bouncycastle/crypto/Mac.java rename to common/src/main/java/org/bouncycastle/crypto/Mac.java diff --git a/src/org/bouncycastle/crypto/MaxBytesExceededException.java b/common/src/main/java/org/bouncycastle/crypto/MaxBytesExceededException.java similarity index 100% rename from src/org/bouncycastle/crypto/MaxBytesExceededException.java rename to common/src/main/java/org/bouncycastle/crypto/MaxBytesExceededException.java diff --git a/src/org/bouncycastle/crypto/PBEParametersGenerator.java b/common/src/main/java/org/bouncycastle/crypto/PBEParametersGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/PBEParametersGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/PBEParametersGenerator.java diff --git a/src/org/bouncycastle/crypto/RuntimeCryptoException.java b/common/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java similarity index 100% rename from src/org/bouncycastle/crypto/RuntimeCryptoException.java rename to common/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java diff --git a/src/org/bouncycastle/crypto/Signer.java b/common/src/main/java/org/bouncycastle/crypto/Signer.java similarity index 100% rename from src/org/bouncycastle/crypto/Signer.java rename to common/src/main/java/org/bouncycastle/crypto/Signer.java diff --git a/src/org/bouncycastle/crypto/SignerWithRecovery.java b/common/src/main/java/org/bouncycastle/crypto/SignerWithRecovery.java similarity index 100% rename from src/org/bouncycastle/crypto/SignerWithRecovery.java rename to common/src/main/java/org/bouncycastle/crypto/SignerWithRecovery.java diff --git a/src/org/bouncycastle/crypto/StreamBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/StreamBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java diff --git a/src/org/bouncycastle/crypto/StreamCipher.java b/common/src/main/java/org/bouncycastle/crypto/StreamCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/StreamCipher.java rename to common/src/main/java/org/bouncycastle/crypto/StreamCipher.java diff --git a/src/org/bouncycastle/crypto/Wrapper.java b/common/src/main/java/org/bouncycastle/crypto/Wrapper.java similarity index 100% rename from src/org/bouncycastle/crypto/Wrapper.java rename to common/src/main/java/org/bouncycastle/crypto/Wrapper.java diff --git a/src/org/bouncycastle/crypto/agreement/DHAgreement.java b/common/src/main/java/org/bouncycastle/crypto/agreement/DHAgreement.java similarity index 100% rename from src/org/bouncycastle/crypto/agreement/DHAgreement.java rename to common/src/main/java/org/bouncycastle/crypto/agreement/DHAgreement.java diff --git a/src/org/bouncycastle/crypto/agreement/DHBasicAgreement.java b/common/src/main/java/org/bouncycastle/crypto/agreement/DHBasicAgreement.java similarity index 100% rename from src/org/bouncycastle/crypto/agreement/DHBasicAgreement.java rename to common/src/main/java/org/bouncycastle/crypto/agreement/DHBasicAgreement.java diff --git a/src/org/bouncycastle/crypto/agreement/ECDHBasicAgreement.java b/common/src/main/java/org/bouncycastle/crypto/agreement/ECDHBasicAgreement.java similarity index 100% rename from src/org/bouncycastle/crypto/agreement/ECDHBasicAgreement.java rename to common/src/main/java/org/bouncycastle/crypto/agreement/ECDHBasicAgreement.java diff --git a/src/org/bouncycastle/crypto/agreement/ECDHCBasicAgreement.java b/common/src/main/java/org/bouncycastle/crypto/agreement/ECDHCBasicAgreement.java similarity index 100% rename from src/org/bouncycastle/crypto/agreement/ECDHCBasicAgreement.java rename to common/src/main/java/org/bouncycastle/crypto/agreement/ECDHCBasicAgreement.java diff --git a/src/org/bouncycastle/crypto/agreement/ECMQVBasicAgreement.java b/common/src/main/java/org/bouncycastle/crypto/agreement/ECMQVBasicAgreement.java similarity index 100% rename from src/org/bouncycastle/crypto/agreement/ECMQVBasicAgreement.java rename to common/src/main/java/org/bouncycastle/crypto/agreement/ECMQVBasicAgreement.java diff --git a/src/org/bouncycastle/crypto/agreement/srp/SRP6Client.java b/common/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Client.java similarity index 100% rename from src/org/bouncycastle/crypto/agreement/srp/SRP6Client.java rename to common/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Client.java diff --git a/src/org/bouncycastle/crypto/agreement/srp/SRP6Server.java b/common/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Server.java similarity index 100% rename from src/org/bouncycastle/crypto/agreement/srp/SRP6Server.java rename to common/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Server.java diff --git a/src/org/bouncycastle/crypto/agreement/srp/SRP6Util.java b/common/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Util.java similarity index 100% rename from src/org/bouncycastle/crypto/agreement/srp/SRP6Util.java rename to common/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Util.java diff --git a/src/org/bouncycastle/crypto/agreement/srp/SRP6VerifierGenerator.java b/common/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6VerifierGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/agreement/srp/SRP6VerifierGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6VerifierGenerator.java diff --git a/src/org/bouncycastle/crypto/digests/GeneralDigest.java b/common/src/main/java/org/bouncycastle/crypto/digests/GeneralDigest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/GeneralDigest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/GeneralDigest.java diff --git a/src/org/bouncycastle/crypto/digests/LongDigest.java b/common/src/main/java/org/bouncycastle/crypto/digests/LongDigest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/LongDigest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/LongDigest.java diff --git a/src/org/bouncycastle/crypto/digests/MD2Digest.java b/common/src/main/java/org/bouncycastle/crypto/digests/MD2Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/MD2Digest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/MD2Digest.java diff --git a/src/org/bouncycastle/crypto/digests/MD4Digest.java b/common/src/main/java/org/bouncycastle/crypto/digests/MD4Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/MD4Digest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/MD4Digest.java diff --git a/src/org/bouncycastle/crypto/digests/MD5Digest.java b/common/src/main/java/org/bouncycastle/crypto/digests/MD5Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/MD5Digest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/MD5Digest.java diff --git a/src/org/bouncycastle/crypto/digests/NullDigest.java b/common/src/main/java/org/bouncycastle/crypto/digests/NullDigest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/NullDigest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/NullDigest.java diff --git a/src/org/bouncycastle/crypto/digests/RIPEMD128Digest.java b/common/src/main/java/org/bouncycastle/crypto/digests/RIPEMD128Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/RIPEMD128Digest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/RIPEMD128Digest.java diff --git a/src/org/bouncycastle/crypto/digests/RIPEMD160Digest.java b/common/src/main/java/org/bouncycastle/crypto/digests/RIPEMD160Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/RIPEMD160Digest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/RIPEMD160Digest.java diff --git a/src/org/bouncycastle/crypto/digests/RIPEMD256Digest.java b/common/src/main/java/org/bouncycastle/crypto/digests/RIPEMD256Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/RIPEMD256Digest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/RIPEMD256Digest.java diff --git a/src/org/bouncycastle/crypto/digests/RIPEMD320Digest.java b/common/src/main/java/org/bouncycastle/crypto/digests/RIPEMD320Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/RIPEMD320Digest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/RIPEMD320Digest.java diff --git a/src/org/bouncycastle/crypto/digests/SHA1Digest.java b/common/src/main/java/org/bouncycastle/crypto/digests/SHA1Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/SHA1Digest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/SHA1Digest.java diff --git a/src/org/bouncycastle/crypto/digests/SHA224Digest.java b/common/src/main/java/org/bouncycastle/crypto/digests/SHA224Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/SHA224Digest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/SHA224Digest.java diff --git a/src/org/bouncycastle/crypto/digests/SHA256Digest.java b/common/src/main/java/org/bouncycastle/crypto/digests/SHA256Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/SHA256Digest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/SHA256Digest.java diff --git a/src/org/bouncycastle/crypto/digests/SHA384Digest.java b/common/src/main/java/org/bouncycastle/crypto/digests/SHA384Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/SHA384Digest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/SHA384Digest.java diff --git a/src/org/bouncycastle/crypto/digests/SHA512Digest.java b/common/src/main/java/org/bouncycastle/crypto/digests/SHA512Digest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/SHA512Digest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/SHA512Digest.java diff --git a/src/org/bouncycastle/crypto/digests/ShortenedDigest.java b/common/src/main/java/org/bouncycastle/crypto/digests/ShortenedDigest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/ShortenedDigest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/ShortenedDigest.java diff --git a/src/org/bouncycastle/crypto/digests/TigerDigest.java b/common/src/main/java/org/bouncycastle/crypto/digests/TigerDigest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/TigerDigest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/TigerDigest.java diff --git a/src/org/bouncycastle/crypto/digests/WhirlpoolDigest.java b/common/src/main/java/org/bouncycastle/crypto/digests/WhirlpoolDigest.java similarity index 100% rename from src/org/bouncycastle/crypto/digests/WhirlpoolDigest.java rename to common/src/main/java/org/bouncycastle/crypto/digests/WhirlpoolDigest.java diff --git a/src/org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java b/common/src/main/java/org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java similarity index 100% rename from src/org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java rename to common/src/main/java/org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java diff --git a/src/org/bouncycastle/crypto/encodings/OAEPEncoding.java b/common/src/main/java/org/bouncycastle/crypto/encodings/OAEPEncoding.java similarity index 100% rename from src/org/bouncycastle/crypto/encodings/OAEPEncoding.java rename to common/src/main/java/org/bouncycastle/crypto/encodings/OAEPEncoding.java diff --git a/src/org/bouncycastle/crypto/encodings/PKCS1Encoding.java b/common/src/main/java/org/bouncycastle/crypto/encodings/PKCS1Encoding.java similarity index 100% rename from src/org/bouncycastle/crypto/encodings/PKCS1Encoding.java rename to common/src/main/java/org/bouncycastle/crypto/encodings/PKCS1Encoding.java diff --git a/src/org/bouncycastle/crypto/engines/AESEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/AESEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java diff --git a/src/org/bouncycastle/crypto/engines/AESFastEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/AESFastEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/AESFastEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/AESFastEngine.java diff --git a/src/org/bouncycastle/crypto/engines/AESLightEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/AESLightEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/AESLightEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/AESLightEngine.java diff --git a/src/org/bouncycastle/crypto/engines/AESWrapEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/AESWrapEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/AESWrapEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/AESWrapEngine.java diff --git a/src/org/bouncycastle/crypto/engines/BlowfishEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/BlowfishEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/BlowfishEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/BlowfishEngine.java diff --git a/src/org/bouncycastle/crypto/engines/DESEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/DESEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/DESEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/DESEngine.java diff --git a/src/org/bouncycastle/crypto/engines/DESedeEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/DESedeEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/DESedeEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/DESedeEngine.java diff --git a/src/org/bouncycastle/crypto/engines/DESedeWrapEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/DESedeWrapEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/DESedeWrapEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/DESedeWrapEngine.java diff --git a/src/org/bouncycastle/crypto/engines/HC128Engine.java b/common/src/main/java/org/bouncycastle/crypto/engines/HC128Engine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/HC128Engine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/HC128Engine.java diff --git a/src/org/bouncycastle/crypto/engines/HC256Engine.java b/common/src/main/java/org/bouncycastle/crypto/engines/HC256Engine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/HC256Engine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/HC256Engine.java diff --git a/src/org/bouncycastle/crypto/engines/IDEAEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/IDEAEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/IDEAEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/IDEAEngine.java diff --git a/src/org/bouncycastle/crypto/engines/IESEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/IESEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/IESEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/IESEngine.java diff --git a/src/org/bouncycastle/crypto/engines/NullEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/NullEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/NullEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/NullEngine.java diff --git a/src/org/bouncycastle/crypto/engines/RFC3211WrapEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/RFC3211WrapEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/RFC3211WrapEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/RFC3211WrapEngine.java diff --git a/src/org/bouncycastle/crypto/engines/RFC3394WrapEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/RFC3394WrapEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/RFC3394WrapEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/RFC3394WrapEngine.java diff --git a/src/org/bouncycastle/crypto/engines/RSABlindedEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/RSABlindedEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/RSABlindedEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/RSABlindedEngine.java diff --git a/src/org/bouncycastle/crypto/engines/RSABlindingEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/RSABlindingEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/RSABlindingEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/RSABlindingEngine.java diff --git a/src/org/bouncycastle/crypto/engines/RSACoreEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/RSACoreEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/RSACoreEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/RSACoreEngine.java diff --git a/src/org/bouncycastle/crypto/engines/RSAEngine.java b/common/src/main/java/org/bouncycastle/crypto/engines/RSAEngine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/RSAEngine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/RSAEngine.java diff --git a/src/org/bouncycastle/crypto/engines/Salsa20Engine.java b/common/src/main/java/org/bouncycastle/crypto/engines/Salsa20Engine.java similarity index 100% rename from src/org/bouncycastle/crypto/engines/Salsa20Engine.java rename to common/src/main/java/org/bouncycastle/crypto/engines/Salsa20Engine.java diff --git a/src/org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/DESKeyGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/DESKeyGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/DESKeyGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/DESKeyGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/DESedeKeyGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/DESedeKeyGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/DESedeKeyGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/DESedeKeyGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/DHBasicKeyPairGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/DHBasicKeyPairGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/DHBasicKeyPairGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/DHBasicKeyPairGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/DHKeyGeneratorHelper.java b/common/src/main/java/org/bouncycastle/crypto/generators/DHKeyGeneratorHelper.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/DHKeyGeneratorHelper.java rename to common/src/main/java/org/bouncycastle/crypto/generators/DHKeyGeneratorHelper.java diff --git a/src/org/bouncycastle/crypto/generators/DHKeyPairGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/DHKeyPairGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/DHKeyPairGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/DHKeyPairGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/DHParametersGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/DHParametersGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/DHParametersGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/DHParametersGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/DHParametersHelper.java b/common/src/main/java/org/bouncycastle/crypto/generators/DHParametersHelper.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/DHParametersHelper.java rename to common/src/main/java/org/bouncycastle/crypto/generators/DHParametersHelper.java diff --git a/src/org/bouncycastle/crypto/generators/DSAKeyPairGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/DSAKeyPairGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/DSAKeyPairGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/DSAKeyPairGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/DSAParametersGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/DSAParametersGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/DSAParametersGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/DSAParametersGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/ECKeyPairGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/ECKeyPairGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/ECKeyPairGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/ECKeyPairGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/ElGamalKeyPairGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/ElGamalKeyPairGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/ElGamalKeyPairGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/ElGamalKeyPairGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/ElGamalParametersGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/ElGamalParametersGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/ElGamalParametersGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/ElGamalParametersGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/GOST3410KeyPairGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/GOST3410KeyPairGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/GOST3410KeyPairGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/GOST3410KeyPairGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/GOST3410ParametersGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/GOST3410ParametersGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/GOST3410ParametersGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/GOST3410ParametersGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/KDF1BytesGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/KDF1BytesGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/KDF1BytesGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/KDF1BytesGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/KDF2BytesGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/KDF2BytesGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/KDF2BytesGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/KDF2BytesGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/MGF1BytesGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/MGF1BytesGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/MGF1BytesGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/MGF1BytesGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/NaccacheSternKeyPairGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/NaccacheSternKeyPairGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/NaccacheSternKeyPairGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/NaccacheSternKeyPairGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/RSABlindingFactorGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/RSABlindingFactorGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/RSABlindingFactorGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/RSABlindingFactorGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/RSAKeyPairGenerator.java b/common/src/main/java/org/bouncycastle/crypto/generators/RSAKeyPairGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/RSAKeyPairGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/generators/RSAKeyPairGenerator.java diff --git a/src/org/bouncycastle/crypto/generators/SCrypt.java b/common/src/main/java/org/bouncycastle/crypto/generators/SCrypt.java similarity index 100% rename from src/org/bouncycastle/crypto/generators/SCrypt.java rename to common/src/main/java/org/bouncycastle/crypto/generators/SCrypt.java diff --git a/src/org/bouncycastle/crypto/io/CipherInputStream.java b/common/src/main/java/org/bouncycastle/crypto/io/CipherInputStream.java similarity index 100% rename from src/org/bouncycastle/crypto/io/CipherInputStream.java rename to common/src/main/java/org/bouncycastle/crypto/io/CipherInputStream.java diff --git a/src/org/bouncycastle/crypto/io/CipherOutputStream.java b/common/src/main/java/org/bouncycastle/crypto/io/CipherOutputStream.java similarity index 100% rename from src/org/bouncycastle/crypto/io/CipherOutputStream.java rename to common/src/main/java/org/bouncycastle/crypto/io/CipherOutputStream.java diff --git a/src/org/bouncycastle/crypto/io/DigestInputStream.java b/common/src/main/java/org/bouncycastle/crypto/io/DigestInputStream.java similarity index 100% rename from src/org/bouncycastle/crypto/io/DigestInputStream.java rename to common/src/main/java/org/bouncycastle/crypto/io/DigestInputStream.java diff --git a/src/org/bouncycastle/crypto/io/DigestOutputStream.java b/common/src/main/java/org/bouncycastle/crypto/io/DigestOutputStream.java similarity index 100% rename from src/org/bouncycastle/crypto/io/DigestOutputStream.java rename to common/src/main/java/org/bouncycastle/crypto/io/DigestOutputStream.java diff --git a/src/org/bouncycastle/crypto/io/MacInputStream.java b/common/src/main/java/org/bouncycastle/crypto/io/MacInputStream.java similarity index 100% rename from src/org/bouncycastle/crypto/io/MacInputStream.java rename to common/src/main/java/org/bouncycastle/crypto/io/MacInputStream.java diff --git a/src/org/bouncycastle/crypto/io/MacOutputStream.java b/common/src/main/java/org/bouncycastle/crypto/io/MacOutputStream.java similarity index 100% rename from src/org/bouncycastle/crypto/io/MacOutputStream.java rename to common/src/main/java/org/bouncycastle/crypto/io/MacOutputStream.java diff --git a/src/org/bouncycastle/crypto/io/SignerInputStream.java b/common/src/main/java/org/bouncycastle/crypto/io/SignerInputStream.java similarity index 100% rename from src/org/bouncycastle/crypto/io/SignerInputStream.java rename to common/src/main/java/org/bouncycastle/crypto/io/SignerInputStream.java diff --git a/src/org/bouncycastle/crypto/io/SignerOutputStream.java b/common/src/main/java/org/bouncycastle/crypto/io/SignerOutputStream.java similarity index 100% rename from src/org/bouncycastle/crypto/io/SignerOutputStream.java rename to common/src/main/java/org/bouncycastle/crypto/io/SignerOutputStream.java diff --git a/src/org/bouncycastle/crypto/macs/BlockCipherMac.java b/common/src/main/java/org/bouncycastle/crypto/macs/BlockCipherMac.java similarity index 100% rename from src/org/bouncycastle/crypto/macs/BlockCipherMac.java rename to common/src/main/java/org/bouncycastle/crypto/macs/BlockCipherMac.java diff --git a/src/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java b/common/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java similarity index 100% rename from src/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java rename to common/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java diff --git a/src/org/bouncycastle/crypto/macs/CFBBlockCipherMac.java b/common/src/main/java/org/bouncycastle/crypto/macs/CFBBlockCipherMac.java similarity index 100% rename from src/org/bouncycastle/crypto/macs/CFBBlockCipherMac.java rename to common/src/main/java/org/bouncycastle/crypto/macs/CFBBlockCipherMac.java diff --git a/src/org/bouncycastle/crypto/macs/CMac.java b/common/src/main/java/org/bouncycastle/crypto/macs/CMac.java similarity index 100% rename from src/org/bouncycastle/crypto/macs/CMac.java rename to common/src/main/java/org/bouncycastle/crypto/macs/CMac.java diff --git a/src/org/bouncycastle/crypto/macs/GOST28147Mac.java b/common/src/main/java/org/bouncycastle/crypto/macs/GOST28147Mac.java similarity index 100% rename from src/org/bouncycastle/crypto/macs/GOST28147Mac.java rename to common/src/main/java/org/bouncycastle/crypto/macs/GOST28147Mac.java diff --git a/src/org/bouncycastle/crypto/macs/HMac.java b/common/src/main/java/org/bouncycastle/crypto/macs/HMac.java similarity index 100% rename from src/org/bouncycastle/crypto/macs/HMac.java rename to common/src/main/java/org/bouncycastle/crypto/macs/HMac.java diff --git a/src/org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java b/common/src/main/java/org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java similarity index 100% rename from src/org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java rename to common/src/main/java/org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java diff --git a/src/org/bouncycastle/crypto/macs/OldHMac.java b/common/src/main/java/org/bouncycastle/crypto/macs/OldHMac.java similarity index 100% rename from src/org/bouncycastle/crypto/macs/OldHMac.java rename to common/src/main/java/org/bouncycastle/crypto/macs/OldHMac.java diff --git a/src/org/bouncycastle/crypto/macs/VMPCMac.java b/common/src/main/java/org/bouncycastle/crypto/macs/VMPCMac.java similarity index 100% rename from src/org/bouncycastle/crypto/macs/VMPCMac.java rename to common/src/main/java/org/bouncycastle/crypto/macs/VMPCMac.java diff --git a/src/org/bouncycastle/crypto/modes/AEADBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/AEADBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/CBCBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/CBCBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/CCMBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/CCMBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/CFBBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/CFBBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/CFBBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/CFBBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/CTSBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/CTSBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/CTSBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/CTSBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/EAXBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/EAXBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/EAXBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/EAXBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/GCMBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/GCMBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/GCMBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/GCMBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/GOFBBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/GOFBBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/GOFBBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/GOFBBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/OFBBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/OFBBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/OFBBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/OFBBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/OpenPGPCFBBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/OpenPGPCFBBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/OpenPGPCFBBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/OpenPGPCFBBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/PGPCFBBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/PGPCFBBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/PGPCFBBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/PGPCFBBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/PaddedBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/PaddedBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/PaddedBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/PaddedBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/SICBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/SICBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java diff --git a/src/org/bouncycastle/crypto/modes/gcm/BasicGCMExponentiator.java b/common/src/main/java/org/bouncycastle/crypto/modes/gcm/BasicGCMExponentiator.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/gcm/BasicGCMExponentiator.java rename to common/src/main/java/org/bouncycastle/crypto/modes/gcm/BasicGCMExponentiator.java diff --git a/src/org/bouncycastle/crypto/modes/gcm/BasicGCMMultiplier.java b/common/src/main/java/org/bouncycastle/crypto/modes/gcm/BasicGCMMultiplier.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/gcm/BasicGCMMultiplier.java rename to common/src/main/java/org/bouncycastle/crypto/modes/gcm/BasicGCMMultiplier.java diff --git a/src/org/bouncycastle/crypto/modes/gcm/GCMExponentiator.java b/common/src/main/java/org/bouncycastle/crypto/modes/gcm/GCMExponentiator.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/gcm/GCMExponentiator.java rename to common/src/main/java/org/bouncycastle/crypto/modes/gcm/GCMExponentiator.java diff --git a/src/org/bouncycastle/crypto/modes/gcm/GCMMultiplier.java b/common/src/main/java/org/bouncycastle/crypto/modes/gcm/GCMMultiplier.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/gcm/GCMMultiplier.java rename to common/src/main/java/org/bouncycastle/crypto/modes/gcm/GCMMultiplier.java diff --git a/src/org/bouncycastle/crypto/modes/gcm/GCMUtil.java b/common/src/main/java/org/bouncycastle/crypto/modes/gcm/GCMUtil.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/gcm/GCMUtil.java rename to common/src/main/java/org/bouncycastle/crypto/modes/gcm/GCMUtil.java diff --git a/src/org/bouncycastle/crypto/modes/gcm/Tables1kGCMExponentiator.java b/common/src/main/java/org/bouncycastle/crypto/modes/gcm/Tables1kGCMExponentiator.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/gcm/Tables1kGCMExponentiator.java rename to common/src/main/java/org/bouncycastle/crypto/modes/gcm/Tables1kGCMExponentiator.java diff --git a/src/org/bouncycastle/crypto/modes/gcm/Tables64kGCMMultiplier.java b/common/src/main/java/org/bouncycastle/crypto/modes/gcm/Tables64kGCMMultiplier.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/gcm/Tables64kGCMMultiplier.java rename to common/src/main/java/org/bouncycastle/crypto/modes/gcm/Tables64kGCMMultiplier.java diff --git a/src/org/bouncycastle/crypto/modes/gcm/Tables8kGCMMultiplier.java b/common/src/main/java/org/bouncycastle/crypto/modes/gcm/Tables8kGCMMultiplier.java similarity index 100% rename from src/org/bouncycastle/crypto/modes/gcm/Tables8kGCMMultiplier.java rename to common/src/main/java/org/bouncycastle/crypto/modes/gcm/Tables8kGCMMultiplier.java diff --git a/src/org/bouncycastle/crypto/paddings/BlockCipherPadding.java b/common/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java similarity index 100% rename from src/org/bouncycastle/crypto/paddings/BlockCipherPadding.java rename to common/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java diff --git a/src/org/bouncycastle/crypto/paddings/ISO10126d2Padding.java b/common/src/main/java/org/bouncycastle/crypto/paddings/ISO10126d2Padding.java similarity index 100% rename from src/org/bouncycastle/crypto/paddings/ISO10126d2Padding.java rename to common/src/main/java/org/bouncycastle/crypto/paddings/ISO10126d2Padding.java diff --git a/src/org/bouncycastle/crypto/paddings/ISO7816d4Padding.java b/common/src/main/java/org/bouncycastle/crypto/paddings/ISO7816d4Padding.java similarity index 100% rename from src/org/bouncycastle/crypto/paddings/ISO7816d4Padding.java rename to common/src/main/java/org/bouncycastle/crypto/paddings/ISO7816d4Padding.java diff --git a/src/org/bouncycastle/crypto/paddings/PKCS7Padding.java b/common/src/main/java/org/bouncycastle/crypto/paddings/PKCS7Padding.java similarity index 100% rename from src/org/bouncycastle/crypto/paddings/PKCS7Padding.java rename to common/src/main/java/org/bouncycastle/crypto/paddings/PKCS7Padding.java diff --git a/src/org/bouncycastle/crypto/paddings/PaddedBufferedBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/paddings/PaddedBufferedBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/paddings/PaddedBufferedBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/paddings/PaddedBufferedBlockCipher.java diff --git a/src/org/bouncycastle/crypto/paddings/TBCPadding.java b/common/src/main/java/org/bouncycastle/crypto/paddings/TBCPadding.java similarity index 100% rename from src/org/bouncycastle/crypto/paddings/TBCPadding.java rename to common/src/main/java/org/bouncycastle/crypto/paddings/TBCPadding.java diff --git a/src/org/bouncycastle/crypto/paddings/X923Padding.java b/common/src/main/java/org/bouncycastle/crypto/paddings/X923Padding.java similarity index 100% rename from src/org/bouncycastle/crypto/paddings/X923Padding.java rename to common/src/main/java/org/bouncycastle/crypto/paddings/X923Padding.java diff --git a/src/org/bouncycastle/crypto/paddings/ZeroBytePadding.java b/common/src/main/java/org/bouncycastle/crypto/paddings/ZeroBytePadding.java similarity index 100% rename from src/org/bouncycastle/crypto/paddings/ZeroBytePadding.java rename to common/src/main/java/org/bouncycastle/crypto/paddings/ZeroBytePadding.java diff --git a/src/org/bouncycastle/crypto/params/AEADParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/AEADParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/AEADParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/AEADParameters.java diff --git a/src/org/bouncycastle/crypto/params/AsymmetricKeyParameter.java b/common/src/main/java/org/bouncycastle/crypto/params/AsymmetricKeyParameter.java similarity index 100% rename from src/org/bouncycastle/crypto/params/AsymmetricKeyParameter.java rename to common/src/main/java/org/bouncycastle/crypto/params/AsymmetricKeyParameter.java diff --git a/src/org/bouncycastle/crypto/params/CCMParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/CCMParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/CCMParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/CCMParameters.java diff --git a/src/org/bouncycastle/crypto/params/DESParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DESParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DESParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DESParameters.java diff --git a/src/org/bouncycastle/crypto/params/DESedeParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DESedeParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DESedeParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DESedeParameters.java diff --git a/src/org/bouncycastle/crypto/params/DHKeyGenerationParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DHKeyGenerationParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DHKeyGenerationParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DHKeyGenerationParameters.java diff --git a/src/org/bouncycastle/crypto/params/DHKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DHKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DHKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DHKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/DHParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DHParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DHParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DHParameters.java diff --git a/src/org/bouncycastle/crypto/params/DHPrivateKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DHPrivateKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DHPrivateKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DHPrivateKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/DHPublicKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DHPublicKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DHPublicKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DHPublicKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/DHValidationParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DHValidationParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DHValidationParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DHValidationParameters.java diff --git a/src/org/bouncycastle/crypto/params/DSAKeyGenerationParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DSAKeyGenerationParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DSAKeyGenerationParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DSAKeyGenerationParameters.java diff --git a/src/org/bouncycastle/crypto/params/DSAKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DSAKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DSAKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DSAKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/DSAParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DSAParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DSAParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DSAParameters.java diff --git a/src/org/bouncycastle/crypto/params/DSAPrivateKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DSAPrivateKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DSAPrivateKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DSAPrivateKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/DSAPublicKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DSAPublicKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DSAPublicKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DSAPublicKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/DSAValidationParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/DSAValidationParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/DSAValidationParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/DSAValidationParameters.java diff --git a/src/org/bouncycastle/crypto/params/ECDomainParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/ECDomainParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ECDomainParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/ECDomainParameters.java diff --git a/src/org/bouncycastle/crypto/params/ECKeyGenerationParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/ECKeyGenerationParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ECKeyGenerationParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/ECKeyGenerationParameters.java diff --git a/src/org/bouncycastle/crypto/params/ECKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/ECKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ECKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/ECKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/ECPrivateKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/ECPrivateKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ECPrivateKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/ECPrivateKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/ECPublicKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/ECPublicKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ECPublicKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/ECPublicKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/ElGamalKeyGenerationParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/ElGamalKeyGenerationParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ElGamalKeyGenerationParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/ElGamalKeyGenerationParameters.java diff --git a/src/org/bouncycastle/crypto/params/ElGamalKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/ElGamalKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ElGamalKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/ElGamalKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/ElGamalParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/ElGamalParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ElGamalParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/ElGamalParameters.java diff --git a/src/org/bouncycastle/crypto/params/ElGamalPrivateKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/ElGamalPrivateKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ElGamalPrivateKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/ElGamalPrivateKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/ElGamalPublicKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/ElGamalPublicKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ElGamalPublicKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/ElGamalPublicKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/GOST3410KeyGenerationParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/GOST3410KeyGenerationParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/GOST3410KeyGenerationParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/GOST3410KeyGenerationParameters.java diff --git a/src/org/bouncycastle/crypto/params/GOST3410KeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/GOST3410KeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/GOST3410KeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/GOST3410KeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/GOST3410Parameters.java b/common/src/main/java/org/bouncycastle/crypto/params/GOST3410Parameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/GOST3410Parameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/GOST3410Parameters.java diff --git a/src/org/bouncycastle/crypto/params/GOST3410PrivateKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/GOST3410PrivateKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/GOST3410PrivateKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/GOST3410PrivateKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/GOST3410PublicKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/GOST3410PublicKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/GOST3410PublicKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/GOST3410PublicKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/GOST3410ValidationParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/GOST3410ValidationParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/GOST3410ValidationParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/GOST3410ValidationParameters.java diff --git a/src/org/bouncycastle/crypto/params/IESParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/IESParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/IESParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/IESParameters.java diff --git a/src/org/bouncycastle/crypto/params/IESWithCipherParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/IESWithCipherParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/IESWithCipherParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/IESWithCipherParameters.java diff --git a/src/org/bouncycastle/crypto/params/ISO18033KDFParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/ISO18033KDFParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ISO18033KDFParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/ISO18033KDFParameters.java diff --git a/src/org/bouncycastle/crypto/params/KDFParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/KDFParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/KDFParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/KDFParameters.java diff --git a/src/org/bouncycastle/crypto/params/KeyParameter.java b/common/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java similarity index 100% rename from src/org/bouncycastle/crypto/params/KeyParameter.java rename to common/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java diff --git a/src/org/bouncycastle/crypto/params/MGFParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/MGFParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/MGFParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/MGFParameters.java diff --git a/src/org/bouncycastle/crypto/params/MQVPrivateParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/MQVPrivateParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/MQVPrivateParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/MQVPrivateParameters.java diff --git a/src/org/bouncycastle/crypto/params/MQVPublicParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/MQVPublicParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/MQVPublicParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/MQVPublicParameters.java diff --git a/src/org/bouncycastle/crypto/params/NaccacheSternKeyGenerationParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/NaccacheSternKeyGenerationParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/NaccacheSternKeyGenerationParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/NaccacheSternKeyGenerationParameters.java diff --git a/src/org/bouncycastle/crypto/params/NaccacheSternKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/NaccacheSternKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/NaccacheSternKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/NaccacheSternKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/NaccacheSternPrivateKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/NaccacheSternPrivateKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/NaccacheSternPrivateKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/NaccacheSternPrivateKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/ParametersWithIV.java b/common/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ParametersWithIV.java rename to common/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java diff --git a/src/org/bouncycastle/crypto/params/ParametersWithRandom.java b/common/src/main/java/org/bouncycastle/crypto/params/ParametersWithRandom.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ParametersWithRandom.java rename to common/src/main/java/org/bouncycastle/crypto/params/ParametersWithRandom.java diff --git a/src/org/bouncycastle/crypto/params/ParametersWithSBox.java b/common/src/main/java/org/bouncycastle/crypto/params/ParametersWithSBox.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ParametersWithSBox.java rename to common/src/main/java/org/bouncycastle/crypto/params/ParametersWithSBox.java diff --git a/src/org/bouncycastle/crypto/params/ParametersWithSalt.java b/common/src/main/java/org/bouncycastle/crypto/params/ParametersWithSalt.java similarity index 100% rename from src/org/bouncycastle/crypto/params/ParametersWithSalt.java rename to common/src/main/java/org/bouncycastle/crypto/params/ParametersWithSalt.java diff --git a/src/org/bouncycastle/crypto/params/RC2Parameters.java b/common/src/main/java/org/bouncycastle/crypto/params/RC2Parameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/RC2Parameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/RC2Parameters.java diff --git a/src/org/bouncycastle/crypto/params/RC5Parameters.java b/common/src/main/java/org/bouncycastle/crypto/params/RC5Parameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/RC5Parameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/RC5Parameters.java diff --git a/src/org/bouncycastle/crypto/params/RSABlindingParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/RSABlindingParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/RSABlindingParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/RSABlindingParameters.java diff --git a/src/org/bouncycastle/crypto/params/RSAKeyGenerationParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/RSAKeyGenerationParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/RSAKeyGenerationParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/RSAKeyGenerationParameters.java diff --git a/src/org/bouncycastle/crypto/params/RSAKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/RSAKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/RSAKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/RSAKeyParameters.java diff --git a/src/org/bouncycastle/crypto/params/RSAPrivateCrtKeyParameters.java b/common/src/main/java/org/bouncycastle/crypto/params/RSAPrivateCrtKeyParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/params/RSAPrivateCrtKeyParameters.java rename to common/src/main/java/org/bouncycastle/crypto/params/RSAPrivateCrtKeyParameters.java diff --git a/src/org/bouncycastle/crypto/prng/DigestRandomGenerator.java b/common/src/main/java/org/bouncycastle/crypto/prng/DigestRandomGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/prng/DigestRandomGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/prng/DigestRandomGenerator.java diff --git a/src/org/bouncycastle/crypto/prng/RandomGenerator.java b/common/src/main/java/org/bouncycastle/crypto/prng/RandomGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/prng/RandomGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/prng/RandomGenerator.java diff --git a/src/org/bouncycastle/crypto/prng/ReversedWindowGenerator.java b/common/src/main/java/org/bouncycastle/crypto/prng/ReversedWindowGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/prng/ReversedWindowGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/prng/ReversedWindowGenerator.java diff --git a/src/org/bouncycastle/crypto/prng/ThreadedSeedGenerator.java b/common/src/main/java/org/bouncycastle/crypto/prng/ThreadedSeedGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/prng/ThreadedSeedGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/prng/ThreadedSeedGenerator.java diff --git a/src/org/bouncycastle/crypto/prng/VMPCRandomGenerator.java b/common/src/main/java/org/bouncycastle/crypto/prng/VMPCRandomGenerator.java similarity index 100% rename from src/org/bouncycastle/crypto/prng/VMPCRandomGenerator.java rename to common/src/main/java/org/bouncycastle/crypto/prng/VMPCRandomGenerator.java diff --git a/src/org/bouncycastle/crypto/signers/DSADigestSigner.java b/common/src/main/java/org/bouncycastle/crypto/signers/DSADigestSigner.java similarity index 100% rename from src/org/bouncycastle/crypto/signers/DSADigestSigner.java rename to common/src/main/java/org/bouncycastle/crypto/signers/DSADigestSigner.java diff --git a/src/org/bouncycastle/crypto/signers/DSASigner.java b/common/src/main/java/org/bouncycastle/crypto/signers/DSASigner.java similarity index 100% rename from src/org/bouncycastle/crypto/signers/DSASigner.java rename to common/src/main/java/org/bouncycastle/crypto/signers/DSASigner.java diff --git a/src/org/bouncycastle/crypto/signers/ECDSASigner.java b/common/src/main/java/org/bouncycastle/crypto/signers/ECDSASigner.java similarity index 100% rename from src/org/bouncycastle/crypto/signers/ECDSASigner.java rename to common/src/main/java/org/bouncycastle/crypto/signers/ECDSASigner.java diff --git a/src/org/bouncycastle/crypto/signers/ECGOST3410Signer.java b/common/src/main/java/org/bouncycastle/crypto/signers/ECGOST3410Signer.java similarity index 100% rename from src/org/bouncycastle/crypto/signers/ECGOST3410Signer.java rename to common/src/main/java/org/bouncycastle/crypto/signers/ECGOST3410Signer.java diff --git a/src/org/bouncycastle/crypto/signers/ECNRSigner.java b/common/src/main/java/org/bouncycastle/crypto/signers/ECNRSigner.java similarity index 100% rename from src/org/bouncycastle/crypto/signers/ECNRSigner.java rename to common/src/main/java/org/bouncycastle/crypto/signers/ECNRSigner.java diff --git a/src/org/bouncycastle/crypto/signers/GOST3410Signer.java b/common/src/main/java/org/bouncycastle/crypto/signers/GOST3410Signer.java similarity index 100% rename from src/org/bouncycastle/crypto/signers/GOST3410Signer.java rename to common/src/main/java/org/bouncycastle/crypto/signers/GOST3410Signer.java diff --git a/src/org/bouncycastle/crypto/signers/GenericSigner.java b/common/src/main/java/org/bouncycastle/crypto/signers/GenericSigner.java similarity index 100% rename from src/org/bouncycastle/crypto/signers/GenericSigner.java rename to common/src/main/java/org/bouncycastle/crypto/signers/GenericSigner.java diff --git a/src/org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java b/common/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java similarity index 100% rename from src/org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java rename to common/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java diff --git a/src/org/bouncycastle/crypto/signers/ISO9796d2Signer.java b/common/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2Signer.java similarity index 100% rename from src/org/bouncycastle/crypto/signers/ISO9796d2Signer.java rename to common/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2Signer.java diff --git a/src/org/bouncycastle/crypto/signers/PSSSigner.java b/common/src/main/java/org/bouncycastle/crypto/signers/PSSSigner.java similarity index 100% rename from src/org/bouncycastle/crypto/signers/PSSSigner.java rename to common/src/main/java/org/bouncycastle/crypto/signers/PSSSigner.java diff --git a/src/org/bouncycastle/crypto/signers/RSADigestSigner.java b/common/src/main/java/org/bouncycastle/crypto/signers/RSADigestSigner.java similarity index 100% rename from src/org/bouncycastle/crypto/signers/RSADigestSigner.java rename to common/src/main/java/org/bouncycastle/crypto/signers/RSADigestSigner.java diff --git a/src/org/bouncycastle/crypto/tls/AlertDescription.java b/common/src/main/java/org/bouncycastle/crypto/tls/AlertDescription.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/AlertDescription.java rename to common/src/main/java/org/bouncycastle/crypto/tls/AlertDescription.java diff --git a/src/org/bouncycastle/crypto/tls/AlertLevel.java b/common/src/main/java/org/bouncycastle/crypto/tls/AlertLevel.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/AlertLevel.java rename to common/src/main/java/org/bouncycastle/crypto/tls/AlertLevel.java diff --git a/src/org/bouncycastle/crypto/tls/AlwaysValidVerifyer.java b/common/src/main/java/org/bouncycastle/crypto/tls/AlwaysValidVerifyer.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/AlwaysValidVerifyer.java rename to common/src/main/java/org/bouncycastle/crypto/tls/AlwaysValidVerifyer.java diff --git a/src/org/bouncycastle/crypto/tls/ByteQueue.java b/common/src/main/java/org/bouncycastle/crypto/tls/ByteQueue.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/ByteQueue.java rename to common/src/main/java/org/bouncycastle/crypto/tls/ByteQueue.java diff --git a/src/org/bouncycastle/crypto/tls/Certificate.java b/common/src/main/java/org/bouncycastle/crypto/tls/Certificate.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/Certificate.java rename to common/src/main/java/org/bouncycastle/crypto/tls/Certificate.java diff --git a/src/org/bouncycastle/crypto/tls/CertificateRequest.java b/common/src/main/java/org/bouncycastle/crypto/tls/CertificateRequest.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/CertificateRequest.java rename to common/src/main/java/org/bouncycastle/crypto/tls/CertificateRequest.java diff --git a/src/org/bouncycastle/crypto/tls/CertificateVerifyer.java b/common/src/main/java/org/bouncycastle/crypto/tls/CertificateVerifyer.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/CertificateVerifyer.java rename to common/src/main/java/org/bouncycastle/crypto/tls/CertificateVerifyer.java diff --git a/src/org/bouncycastle/crypto/tls/CipherSuite.java b/common/src/main/java/org/bouncycastle/crypto/tls/CipherSuite.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/CipherSuite.java rename to common/src/main/java/org/bouncycastle/crypto/tls/CipherSuite.java diff --git a/src/org/bouncycastle/crypto/tls/ClientCertificateType.java b/common/src/main/java/org/bouncycastle/crypto/tls/ClientCertificateType.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/ClientCertificateType.java rename to common/src/main/java/org/bouncycastle/crypto/tls/ClientCertificateType.java diff --git a/src/org/bouncycastle/crypto/tls/CombinedHash.java b/common/src/main/java/org/bouncycastle/crypto/tls/CombinedHash.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/CombinedHash.java rename to common/src/main/java/org/bouncycastle/crypto/tls/CombinedHash.java diff --git a/src/org/bouncycastle/crypto/tls/CompressionMethod.java b/common/src/main/java/org/bouncycastle/crypto/tls/CompressionMethod.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/CompressionMethod.java rename to common/src/main/java/org/bouncycastle/crypto/tls/CompressionMethod.java diff --git a/src/org/bouncycastle/crypto/tls/ContentType.java b/common/src/main/java/org/bouncycastle/crypto/tls/ContentType.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/ContentType.java rename to common/src/main/java/org/bouncycastle/crypto/tls/ContentType.java diff --git a/src/org/bouncycastle/crypto/tls/DefaultTlsAgreementCredentials.java b/common/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsAgreementCredentials.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/DefaultTlsAgreementCredentials.java rename to common/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsAgreementCredentials.java diff --git a/src/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java b/common/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java rename to common/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java diff --git a/src/org/bouncycastle/crypto/tls/DefaultTlsClient.java b/common/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsClient.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/DefaultTlsClient.java rename to common/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsClient.java diff --git a/src/org/bouncycastle/crypto/tls/DefaultTlsSignerCredentials.java b/common/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsSignerCredentials.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/DefaultTlsSignerCredentials.java rename to common/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsSignerCredentials.java diff --git a/src/org/bouncycastle/crypto/tls/DigestAlgorithm.java b/common/src/main/java/org/bouncycastle/crypto/tls/DigestAlgorithm.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/DigestAlgorithm.java rename to common/src/main/java/org/bouncycastle/crypto/tls/DigestAlgorithm.java diff --git a/src/org/bouncycastle/crypto/tls/ECCurveType.java b/common/src/main/java/org/bouncycastle/crypto/tls/ECCurveType.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/ECCurveType.java rename to common/src/main/java/org/bouncycastle/crypto/tls/ECCurveType.java diff --git a/src/org/bouncycastle/crypto/tls/ECPointFormat.java b/common/src/main/java/org/bouncycastle/crypto/tls/ECPointFormat.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/ECPointFormat.java rename to common/src/main/java/org/bouncycastle/crypto/tls/ECPointFormat.java diff --git a/src/org/bouncycastle/crypto/tls/EncryptionAlgorithm.java b/common/src/main/java/org/bouncycastle/crypto/tls/EncryptionAlgorithm.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/EncryptionAlgorithm.java rename to common/src/main/java/org/bouncycastle/crypto/tls/EncryptionAlgorithm.java diff --git a/src/org/bouncycastle/crypto/tls/ExtensionType.java b/common/src/main/java/org/bouncycastle/crypto/tls/ExtensionType.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/ExtensionType.java rename to common/src/main/java/org/bouncycastle/crypto/tls/ExtensionType.java diff --git a/src/org/bouncycastle/crypto/tls/HandshakeType.java b/common/src/main/java/org/bouncycastle/crypto/tls/HandshakeType.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/HandshakeType.java rename to common/src/main/java/org/bouncycastle/crypto/tls/HandshakeType.java diff --git a/src/org/bouncycastle/crypto/tls/KeyExchangeAlgorithm.java b/common/src/main/java/org/bouncycastle/crypto/tls/KeyExchangeAlgorithm.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/KeyExchangeAlgorithm.java rename to common/src/main/java/org/bouncycastle/crypto/tls/KeyExchangeAlgorithm.java diff --git a/src/org/bouncycastle/crypto/tls/LegacyTlsAuthentication.java b/common/src/main/java/org/bouncycastle/crypto/tls/LegacyTlsAuthentication.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/LegacyTlsAuthentication.java rename to common/src/main/java/org/bouncycastle/crypto/tls/LegacyTlsAuthentication.java diff --git a/src/org/bouncycastle/crypto/tls/LegacyTlsClient.java b/common/src/main/java/org/bouncycastle/crypto/tls/LegacyTlsClient.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/LegacyTlsClient.java rename to common/src/main/java/org/bouncycastle/crypto/tls/LegacyTlsClient.java diff --git a/src/org/bouncycastle/crypto/tls/NamedCurve.java b/common/src/main/java/org/bouncycastle/crypto/tls/NamedCurve.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/NamedCurve.java rename to common/src/main/java/org/bouncycastle/crypto/tls/NamedCurve.java diff --git a/src/org/bouncycastle/crypto/tls/PSKTlsClient.java b/common/src/main/java/org/bouncycastle/crypto/tls/PSKTlsClient.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/PSKTlsClient.java rename to common/src/main/java/org/bouncycastle/crypto/tls/PSKTlsClient.java diff --git a/src/org/bouncycastle/crypto/tls/ProtocolVersion.java b/common/src/main/java/org/bouncycastle/crypto/tls/ProtocolVersion.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/ProtocolVersion.java rename to common/src/main/java/org/bouncycastle/crypto/tls/ProtocolVersion.java diff --git a/src/org/bouncycastle/crypto/tls/RecordStream.java b/common/src/main/java/org/bouncycastle/crypto/tls/RecordStream.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/RecordStream.java rename to common/src/main/java/org/bouncycastle/crypto/tls/RecordStream.java diff --git a/src/org/bouncycastle/crypto/tls/SRPTlsClient.java b/common/src/main/java/org/bouncycastle/crypto/tls/SRPTlsClient.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/SRPTlsClient.java rename to common/src/main/java/org/bouncycastle/crypto/tls/SRPTlsClient.java diff --git a/src/org/bouncycastle/crypto/tls/SSL3Mac.java b/common/src/main/java/org/bouncycastle/crypto/tls/SSL3Mac.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/SSL3Mac.java rename to common/src/main/java/org/bouncycastle/crypto/tls/SSL3Mac.java diff --git a/src/org/bouncycastle/crypto/tls/SecurityParameters.java b/common/src/main/java/org/bouncycastle/crypto/tls/SecurityParameters.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/SecurityParameters.java rename to common/src/main/java/org/bouncycastle/crypto/tls/SecurityParameters.java diff --git a/src/org/bouncycastle/crypto/tls/TlsAgreementCredentials.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsAgreementCredentials.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsAgreementCredentials.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsAgreementCredentials.java diff --git a/src/org/bouncycastle/crypto/tls/TlsAuthentication.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsAuthentication.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsAuthentication.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsAuthentication.java diff --git a/src/org/bouncycastle/crypto/tls/TlsBlockCipher.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsBlockCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsBlockCipher.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsBlockCipher.java diff --git a/src/org/bouncycastle/crypto/tls/TlsCipher.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsCipher.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsCipher.java diff --git a/src/org/bouncycastle/crypto/tls/TlsCipherFactory.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsCipherFactory.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsCipherFactory.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsCipherFactory.java diff --git a/src/org/bouncycastle/crypto/tls/TlsClient.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsClient.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsClient.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsClient.java diff --git a/src/org/bouncycastle/crypto/tls/TlsClientContext.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsClientContext.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsClientContext.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsClientContext.java diff --git a/src/org/bouncycastle/crypto/tls/TlsClientContextImpl.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsClientContextImpl.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsClientContextImpl.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsClientContextImpl.java diff --git a/src/org/bouncycastle/crypto/tls/TlsCompression.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsCompression.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsCompression.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsCompression.java diff --git a/src/org/bouncycastle/crypto/tls/TlsCredentials.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsCredentials.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsCredentials.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsCredentials.java diff --git a/src/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java diff --git a/src/org/bouncycastle/crypto/tls/TlsDHKeyExchange.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsDHKeyExchange.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsDHKeyExchange.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsDHKeyExchange.java diff --git a/src/org/bouncycastle/crypto/tls/TlsDHUtils.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsDHUtils.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsDHUtils.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsDHUtils.java diff --git a/src/org/bouncycastle/crypto/tls/TlsDSASigner.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsDSASigner.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsDSASigner.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsDSASigner.java diff --git a/src/org/bouncycastle/crypto/tls/TlsDSSSigner.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsDSSSigner.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsDSSSigner.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsDSSSigner.java diff --git a/src/org/bouncycastle/crypto/tls/TlsECDHEKeyExchange.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsECDHEKeyExchange.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsECDHEKeyExchange.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsECDHEKeyExchange.java diff --git a/src/org/bouncycastle/crypto/tls/TlsECDHKeyExchange.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsECDHKeyExchange.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsECDHKeyExchange.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsECDHKeyExchange.java diff --git a/src/org/bouncycastle/crypto/tls/TlsECDSASigner.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsECDSASigner.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsECDSASigner.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsECDSASigner.java diff --git a/src/org/bouncycastle/crypto/tls/TlsFatalAlert.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsFatalAlert.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsFatalAlert.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsFatalAlert.java diff --git a/src/org/bouncycastle/crypto/tls/TlsInputStream.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsInputStream.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsInputStream.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsInputStream.java diff --git a/src/org/bouncycastle/crypto/tls/TlsKeyExchange.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsKeyExchange.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsKeyExchange.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsKeyExchange.java diff --git a/src/org/bouncycastle/crypto/tls/TlsMac.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsMac.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsMac.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsMac.java diff --git a/src/org/bouncycastle/crypto/tls/TlsNullCipher.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsNullCipher.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsNullCipher.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsNullCipher.java diff --git a/src/org/bouncycastle/crypto/tls/TlsNullCompression.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsNullCompression.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsNullCompression.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsNullCompression.java diff --git a/src/org/bouncycastle/crypto/tls/TlsOutputStream.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsOutputStream.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsOutputStream.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsOutputStream.java diff --git a/src/org/bouncycastle/crypto/tls/TlsPSKIdentity.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsPSKIdentity.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsPSKIdentity.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsPSKIdentity.java diff --git a/src/org/bouncycastle/crypto/tls/TlsPSKKeyExchange.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsPSKKeyExchange.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsPSKKeyExchange.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsPSKKeyExchange.java diff --git a/src/org/bouncycastle/crypto/tls/TlsProtocolHandler.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsProtocolHandler.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsProtocolHandler.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsProtocolHandler.java diff --git a/src/org/bouncycastle/crypto/tls/TlsRSAKeyExchange.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsRSAKeyExchange.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsRSAKeyExchange.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsRSAKeyExchange.java diff --git a/src/org/bouncycastle/crypto/tls/TlsRSASigner.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsRSASigner.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsRSASigner.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsRSASigner.java diff --git a/src/org/bouncycastle/crypto/tls/TlsRSAUtils.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsRSAUtils.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsRSAUtils.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsRSAUtils.java diff --git a/src/org/bouncycastle/crypto/tls/TlsRuntimeException.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsRuntimeException.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsRuntimeException.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsRuntimeException.java diff --git a/src/org/bouncycastle/crypto/tls/TlsSRPKeyExchange.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsSRPKeyExchange.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsSRPKeyExchange.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsSRPKeyExchange.java diff --git a/src/org/bouncycastle/crypto/tls/TlsSigner.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsSigner.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsSigner.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsSigner.java diff --git a/src/org/bouncycastle/crypto/tls/TlsSignerCredentials.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsSignerCredentials.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsSignerCredentials.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsSignerCredentials.java diff --git a/src/org/bouncycastle/crypto/tls/TlsUtils.java b/common/src/main/java/org/bouncycastle/crypto/tls/TlsUtils.java similarity index 100% rename from src/org/bouncycastle/crypto/tls/TlsUtils.java rename to common/src/main/java/org/bouncycastle/crypto/tls/TlsUtils.java diff --git a/src/org/bouncycastle/crypto/util/Pack.java b/common/src/main/java/org/bouncycastle/crypto/util/Pack.java similarity index 100% rename from src/org/bouncycastle/crypto/util/Pack.java rename to common/src/main/java/org/bouncycastle/crypto/util/Pack.java diff --git a/src/org/bouncycastle/crypto/util/PrivateKeyFactory.java b/common/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java similarity index 100% rename from src/org/bouncycastle/crypto/util/PrivateKeyFactory.java rename to common/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java diff --git a/src/org/bouncycastle/crypto/util/PublicKeyFactory.java b/common/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java similarity index 100% rename from src/org/bouncycastle/crypto/util/PublicKeyFactory.java rename to common/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java diff --git a/src/org/bouncycastle/math/ec/ECAlgorithms.java b/common/src/main/java/org/bouncycastle/math/ec/ECAlgorithms.java similarity index 100% rename from src/org/bouncycastle/math/ec/ECAlgorithms.java rename to common/src/main/java/org/bouncycastle/math/ec/ECAlgorithms.java diff --git a/src/org/bouncycastle/math/ec/ECConstants.java b/common/src/main/java/org/bouncycastle/math/ec/ECConstants.java similarity index 100% rename from src/org/bouncycastle/math/ec/ECConstants.java rename to common/src/main/java/org/bouncycastle/math/ec/ECConstants.java diff --git a/src/org/bouncycastle/math/ec/ECCurve.java b/common/src/main/java/org/bouncycastle/math/ec/ECCurve.java similarity index 100% rename from src/org/bouncycastle/math/ec/ECCurve.java rename to common/src/main/java/org/bouncycastle/math/ec/ECCurve.java diff --git a/src/org/bouncycastle/math/ec/ECFieldElement.java b/common/src/main/java/org/bouncycastle/math/ec/ECFieldElement.java similarity index 100% rename from src/org/bouncycastle/math/ec/ECFieldElement.java rename to common/src/main/java/org/bouncycastle/math/ec/ECFieldElement.java diff --git a/src/org/bouncycastle/math/ec/ECMultiplier.java b/common/src/main/java/org/bouncycastle/math/ec/ECMultiplier.java similarity index 100% rename from src/org/bouncycastle/math/ec/ECMultiplier.java rename to common/src/main/java/org/bouncycastle/math/ec/ECMultiplier.java diff --git a/src/org/bouncycastle/math/ec/ECPoint.java b/common/src/main/java/org/bouncycastle/math/ec/ECPoint.java similarity index 100% rename from src/org/bouncycastle/math/ec/ECPoint.java rename to common/src/main/java/org/bouncycastle/math/ec/ECPoint.java diff --git a/src/org/bouncycastle/math/ec/FpNafMultiplier.java b/common/src/main/java/org/bouncycastle/math/ec/FpNafMultiplier.java similarity index 100% rename from src/org/bouncycastle/math/ec/FpNafMultiplier.java rename to common/src/main/java/org/bouncycastle/math/ec/FpNafMultiplier.java diff --git a/src/org/bouncycastle/math/ec/IntArray.java b/common/src/main/java/org/bouncycastle/math/ec/IntArray.java similarity index 100% rename from src/org/bouncycastle/math/ec/IntArray.java rename to common/src/main/java/org/bouncycastle/math/ec/IntArray.java diff --git a/src/org/bouncycastle/math/ec/PreCompInfo.java b/common/src/main/java/org/bouncycastle/math/ec/PreCompInfo.java similarity index 100% rename from src/org/bouncycastle/math/ec/PreCompInfo.java rename to common/src/main/java/org/bouncycastle/math/ec/PreCompInfo.java diff --git a/src/org/bouncycastle/math/ec/ReferenceMultiplier.java b/common/src/main/java/org/bouncycastle/math/ec/ReferenceMultiplier.java similarity index 100% rename from src/org/bouncycastle/math/ec/ReferenceMultiplier.java rename to common/src/main/java/org/bouncycastle/math/ec/ReferenceMultiplier.java diff --git a/src/org/bouncycastle/math/ec/SimpleBigDecimal.java b/common/src/main/java/org/bouncycastle/math/ec/SimpleBigDecimal.java similarity index 100% rename from src/org/bouncycastle/math/ec/SimpleBigDecimal.java rename to common/src/main/java/org/bouncycastle/math/ec/SimpleBigDecimal.java diff --git a/src/org/bouncycastle/math/ec/Tnaf.java b/common/src/main/java/org/bouncycastle/math/ec/Tnaf.java similarity index 100% rename from src/org/bouncycastle/math/ec/Tnaf.java rename to common/src/main/java/org/bouncycastle/math/ec/Tnaf.java diff --git a/src/org/bouncycastle/math/ec/WNafMultiplier.java b/common/src/main/java/org/bouncycastle/math/ec/WNafMultiplier.java similarity index 100% rename from src/org/bouncycastle/math/ec/WNafMultiplier.java rename to common/src/main/java/org/bouncycastle/math/ec/WNafMultiplier.java diff --git a/src/org/bouncycastle/math/ec/WNafPreCompInfo.java b/common/src/main/java/org/bouncycastle/math/ec/WNafPreCompInfo.java similarity index 100% rename from src/org/bouncycastle/math/ec/WNafPreCompInfo.java rename to common/src/main/java/org/bouncycastle/math/ec/WNafPreCompInfo.java diff --git a/src/org/bouncycastle/math/ec/WTauNafMultiplier.java b/common/src/main/java/org/bouncycastle/math/ec/WTauNafMultiplier.java similarity index 100% rename from src/org/bouncycastle/math/ec/WTauNafMultiplier.java rename to common/src/main/java/org/bouncycastle/math/ec/WTauNafMultiplier.java diff --git a/src/org/bouncycastle/math/ec/WTauNafPreCompInfo.java b/common/src/main/java/org/bouncycastle/math/ec/WTauNafPreCompInfo.java similarity index 100% rename from src/org/bouncycastle/math/ec/WTauNafPreCompInfo.java rename to common/src/main/java/org/bouncycastle/math/ec/WTauNafPreCompInfo.java diff --git a/src/org/bouncycastle/math/ec/ZTauElement.java b/common/src/main/java/org/bouncycastle/math/ec/ZTauElement.java similarity index 100% rename from src/org/bouncycastle/math/ec/ZTauElement.java rename to common/src/main/java/org/bouncycastle/math/ec/ZTauElement.java diff --git a/src/org/bouncycastle/oiw/ElGamalParameter.java b/common/src/main/java/org/bouncycastle/oiw/ElGamalParameter.java similarity index 100% rename from src/org/bouncycastle/oiw/ElGamalParameter.java rename to common/src/main/java/org/bouncycastle/oiw/ElGamalParameter.java diff --git a/src/org/bouncycastle/oiw/OIWObjectIdentifiers.java b/common/src/main/java/org/bouncycastle/oiw/OIWObjectIdentifiers.java similarity index 100% rename from src/org/bouncycastle/oiw/OIWObjectIdentifiers.java rename to common/src/main/java/org/bouncycastle/oiw/OIWObjectIdentifiers.java diff --git a/src/org/bouncycastle/util/Arrays.java b/common/src/main/java/org/bouncycastle/util/Arrays.java similarity index 100% rename from src/org/bouncycastle/util/Arrays.java rename to common/src/main/java/org/bouncycastle/util/Arrays.java diff --git a/src/org/bouncycastle/util/BigIntegers.java b/common/src/main/java/org/bouncycastle/util/BigIntegers.java similarity index 100% rename from src/org/bouncycastle/util/BigIntegers.java rename to common/src/main/java/org/bouncycastle/util/BigIntegers.java diff --git a/src/org/bouncycastle/util/CollectionStore.java b/common/src/main/java/org/bouncycastle/util/CollectionStore.java similarity index 100% rename from src/org/bouncycastle/util/CollectionStore.java rename to common/src/main/java/org/bouncycastle/util/CollectionStore.java diff --git a/src/org/bouncycastle/util/IPAddress.java b/common/src/main/java/org/bouncycastle/util/IPAddress.java similarity index 100% rename from src/org/bouncycastle/util/IPAddress.java rename to common/src/main/java/org/bouncycastle/util/IPAddress.java diff --git a/src/org/bouncycastle/util/Selector.java b/common/src/main/java/org/bouncycastle/util/Selector.java similarity index 100% rename from src/org/bouncycastle/util/Selector.java rename to common/src/main/java/org/bouncycastle/util/Selector.java diff --git a/src/org/bouncycastle/util/Store.java b/common/src/main/java/org/bouncycastle/util/Store.java similarity index 100% rename from src/org/bouncycastle/util/Store.java rename to common/src/main/java/org/bouncycastle/util/Store.java diff --git a/src/org/bouncycastle/util/StoreException.java b/common/src/main/java/org/bouncycastle/util/StoreException.java similarity index 100% rename from src/org/bouncycastle/util/StoreException.java rename to common/src/main/java/org/bouncycastle/util/StoreException.java diff --git a/src/org/bouncycastle/util/Strings.java b/common/src/main/java/org/bouncycastle/util/Strings.java similarity index 100% rename from src/org/bouncycastle/util/Strings.java rename to common/src/main/java/org/bouncycastle/util/Strings.java diff --git a/src/org/bouncycastle/util/encoders/Base64.java b/common/src/main/java/org/bouncycastle/util/encoders/Base64.java similarity index 100% rename from src/org/bouncycastle/util/encoders/Base64.java rename to common/src/main/java/org/bouncycastle/util/encoders/Base64.java diff --git a/src/org/bouncycastle/util/encoders/Base64Encoder.java b/common/src/main/java/org/bouncycastle/util/encoders/Base64Encoder.java similarity index 100% rename from src/org/bouncycastle/util/encoders/Base64Encoder.java rename to common/src/main/java/org/bouncycastle/util/encoders/Base64Encoder.java diff --git a/src/org/bouncycastle/util/encoders/BufferedDecoder.java b/common/src/main/java/org/bouncycastle/util/encoders/BufferedDecoder.java similarity index 100% rename from src/org/bouncycastle/util/encoders/BufferedDecoder.java rename to common/src/main/java/org/bouncycastle/util/encoders/BufferedDecoder.java diff --git a/src/org/bouncycastle/util/encoders/BufferedEncoder.java b/common/src/main/java/org/bouncycastle/util/encoders/BufferedEncoder.java similarity index 100% rename from src/org/bouncycastle/util/encoders/BufferedEncoder.java rename to common/src/main/java/org/bouncycastle/util/encoders/BufferedEncoder.java diff --git a/src/org/bouncycastle/util/encoders/Encoder.java b/common/src/main/java/org/bouncycastle/util/encoders/Encoder.java similarity index 100% rename from src/org/bouncycastle/util/encoders/Encoder.java rename to common/src/main/java/org/bouncycastle/util/encoders/Encoder.java diff --git a/src/org/bouncycastle/util/encoders/Hex.java b/common/src/main/java/org/bouncycastle/util/encoders/Hex.java similarity index 100% rename from src/org/bouncycastle/util/encoders/Hex.java rename to common/src/main/java/org/bouncycastle/util/encoders/Hex.java diff --git a/src/org/bouncycastle/util/encoders/HexEncoder.java b/common/src/main/java/org/bouncycastle/util/encoders/HexEncoder.java similarity index 100% rename from src/org/bouncycastle/util/encoders/HexEncoder.java rename to common/src/main/java/org/bouncycastle/util/encoders/HexEncoder.java diff --git a/src/org/bouncycastle/util/encoders/HexTranslator.java b/common/src/main/java/org/bouncycastle/util/encoders/HexTranslator.java similarity index 100% rename from src/org/bouncycastle/util/encoders/HexTranslator.java rename to common/src/main/java/org/bouncycastle/util/encoders/HexTranslator.java diff --git a/src/org/bouncycastle/util/encoders/Translator.java b/common/src/main/java/org/bouncycastle/util/encoders/Translator.java similarity index 100% rename from src/org/bouncycastle/util/encoders/Translator.java rename to common/src/main/java/org/bouncycastle/util/encoders/Translator.java diff --git a/src/org/bouncycastle/util/encoders/UrlBase64.java b/common/src/main/java/org/bouncycastle/util/encoders/UrlBase64.java similarity index 100% rename from src/org/bouncycastle/util/encoders/UrlBase64.java rename to common/src/main/java/org/bouncycastle/util/encoders/UrlBase64.java diff --git a/src/org/bouncycastle/util/encoders/UrlBase64Encoder.java b/common/src/main/java/org/bouncycastle/util/encoders/UrlBase64Encoder.java similarity index 100% rename from src/org/bouncycastle/util/encoders/UrlBase64Encoder.java rename to common/src/main/java/org/bouncycastle/util/encoders/UrlBase64Encoder.java diff --git a/src/org/bouncycastle/util/io/StreamOverflowException.java b/common/src/main/java/org/bouncycastle/util/io/StreamOverflowException.java similarity index 100% rename from src/org/bouncycastle/util/io/StreamOverflowException.java rename to common/src/main/java/org/bouncycastle/util/io/StreamOverflowException.java diff --git a/src/org/bouncycastle/util/io/Streams.java b/common/src/main/java/org/bouncycastle/util/io/Streams.java similarity index 100% rename from src/org/bouncycastle/util/io/Streams.java rename to common/src/main/java/org/bouncycastle/util/io/Streams.java diff --git a/src/org/bouncycastle/util/io/TeeInputStream.java b/common/src/main/java/org/bouncycastle/util/io/TeeInputStream.java similarity index 100% rename from src/org/bouncycastle/util/io/TeeInputStream.java rename to common/src/main/java/org/bouncycastle/util/io/TeeInputStream.java diff --git a/src/org/bouncycastle/util/io/TeeOutputStream.java b/common/src/main/java/org/bouncycastle/util/io/TeeOutputStream.java similarity index 100% rename from src/org/bouncycastle/util/io/TeeOutputStream.java rename to common/src/main/java/org/bouncycastle/util/io/TeeOutputStream.java diff --git a/common/src/main/resources/com/codename1/crypto/package.html b/common/src/main/resources/com/codename1/crypto/package.html new file mode 100644 index 0000000..3e5f941 --- /dev/null +++ b/common/src/main/resources/com/codename1/crypto/package.html @@ -0,0 +1,9 @@ + + + + Crypto package + + +

Provides common cryptographic use cases such as encrypted filesystem as a simplified API facade

+ + diff --git a/src/org/bouncycastle/asn1/package.html b/common/src/main/resources/org/bouncycastle/asn1/package.html similarity index 100% rename from src/org/bouncycastle/asn1/package.html rename to common/src/main/resources/org/bouncycastle/asn1/package.html diff --git a/src/org/bouncycastle/asn1/pkcs/package.html b/common/src/main/resources/org/bouncycastle/asn1/pkcs/package.html similarity index 100% rename from src/org/bouncycastle/asn1/pkcs/package.html rename to common/src/main/resources/org/bouncycastle/asn1/pkcs/package.html diff --git a/src/org/bouncycastle/asn1/sec/package.html b/common/src/main/resources/org/bouncycastle/asn1/sec/package.html similarity index 100% rename from src/org/bouncycastle/asn1/sec/package.html rename to common/src/main/resources/org/bouncycastle/asn1/sec/package.html diff --git a/src/org/bouncycastle/asn1/util/package.html b/common/src/main/resources/org/bouncycastle/asn1/util/package.html similarity index 100% rename from src/org/bouncycastle/asn1/util/package.html rename to common/src/main/resources/org/bouncycastle/asn1/util/package.html diff --git a/src/org/bouncycastle/asn1/x509/package.html b/common/src/main/resources/org/bouncycastle/asn1/x509/package.html similarity index 100% rename from src/org/bouncycastle/asn1/x509/package.html rename to common/src/main/resources/org/bouncycastle/asn1/x509/package.html diff --git a/src/org/bouncycastle/asn1/x509/qualified/package.html b/common/src/main/resources/org/bouncycastle/asn1/x509/qualified/package.html similarity index 100% rename from src/org/bouncycastle/asn1/x509/qualified/package.html rename to common/src/main/resources/org/bouncycastle/asn1/x509/qualified/package.html diff --git a/src/org/bouncycastle/asn1/x9/package.html b/common/src/main/resources/org/bouncycastle/asn1/x9/package.html similarity index 100% rename from src/org/bouncycastle/asn1/x9/package.html rename to common/src/main/resources/org/bouncycastle/asn1/x9/package.html diff --git a/src/org/bouncycastle/crypto/agreement/package.html b/common/src/main/resources/org/bouncycastle/crypto/agreement/package.html similarity index 100% rename from src/org/bouncycastle/crypto/agreement/package.html rename to common/src/main/resources/org/bouncycastle/crypto/agreement/package.html diff --git a/src/org/bouncycastle/crypto/digests/package.html b/common/src/main/resources/org/bouncycastle/crypto/digests/package.html similarity index 100% rename from src/org/bouncycastle/crypto/digests/package.html rename to common/src/main/resources/org/bouncycastle/crypto/digests/package.html diff --git a/src/org/bouncycastle/crypto/encodings/package.html b/common/src/main/resources/org/bouncycastle/crypto/encodings/package.html similarity index 100% rename from src/org/bouncycastle/crypto/encodings/package.html rename to common/src/main/resources/org/bouncycastle/crypto/encodings/package.html diff --git a/src/org/bouncycastle/crypto/engines/package.html b/common/src/main/resources/org/bouncycastle/crypto/engines/package.html similarity index 100% rename from src/org/bouncycastle/crypto/engines/package.html rename to common/src/main/resources/org/bouncycastle/crypto/engines/package.html diff --git a/src/org/bouncycastle/crypto/generators/package.html b/common/src/main/resources/org/bouncycastle/crypto/generators/package.html similarity index 100% rename from src/org/bouncycastle/crypto/generators/package.html rename to common/src/main/resources/org/bouncycastle/crypto/generators/package.html diff --git a/src/org/bouncycastle/crypto/io/package.html b/common/src/main/resources/org/bouncycastle/crypto/io/package.html similarity index 100% rename from src/org/bouncycastle/crypto/io/package.html rename to common/src/main/resources/org/bouncycastle/crypto/io/package.html diff --git a/src/org/bouncycastle/crypto/macs/package.html b/common/src/main/resources/org/bouncycastle/crypto/macs/package.html similarity index 100% rename from src/org/bouncycastle/crypto/macs/package.html rename to common/src/main/resources/org/bouncycastle/crypto/macs/package.html diff --git a/src/org/bouncycastle/crypto/modes/package.html b/common/src/main/resources/org/bouncycastle/crypto/modes/package.html similarity index 100% rename from src/org/bouncycastle/crypto/modes/package.html rename to common/src/main/resources/org/bouncycastle/crypto/modes/package.html diff --git a/src/org/bouncycastle/crypto/package.html b/common/src/main/resources/org/bouncycastle/crypto/package.html similarity index 100% rename from src/org/bouncycastle/crypto/package.html rename to common/src/main/resources/org/bouncycastle/crypto/package.html diff --git a/src/org/bouncycastle/crypto/paddings/package.html b/common/src/main/resources/org/bouncycastle/crypto/paddings/package.html similarity index 100% rename from src/org/bouncycastle/crypto/paddings/package.html rename to common/src/main/resources/org/bouncycastle/crypto/paddings/package.html diff --git a/src/org/bouncycastle/crypto/params/package.html b/common/src/main/resources/org/bouncycastle/crypto/params/package.html similarity index 100% rename from src/org/bouncycastle/crypto/params/package.html rename to common/src/main/resources/org/bouncycastle/crypto/params/package.html diff --git a/src/org/bouncycastle/crypto/prng/package.html b/common/src/main/resources/org/bouncycastle/crypto/prng/package.html similarity index 100% rename from src/org/bouncycastle/crypto/prng/package.html rename to common/src/main/resources/org/bouncycastle/crypto/prng/package.html diff --git a/src/org/bouncycastle/crypto/signers/package.html b/common/src/main/resources/org/bouncycastle/crypto/signers/package.html similarity index 100% rename from src/org/bouncycastle/crypto/signers/package.html rename to common/src/main/resources/org/bouncycastle/crypto/signers/package.html diff --git a/src/org/bouncycastle/crypto/tls/package.html b/common/src/main/resources/org/bouncycastle/crypto/tls/package.html similarity index 100% rename from src/org/bouncycastle/crypto/tls/package.html rename to common/src/main/resources/org/bouncycastle/crypto/tls/package.html diff --git a/src/org/bouncycastle/crypto/util/package.html b/common/src/main/resources/org/bouncycastle/crypto/util/package.html similarity index 100% rename from src/org/bouncycastle/crypto/util/package.html rename to common/src/main/resources/org/bouncycastle/crypto/util/package.html diff --git a/src/org/bouncycastle/math/ec/package.html b/common/src/main/resources/org/bouncycastle/math/ec/package.html similarity index 100% rename from src/org/bouncycastle/math/ec/package.html rename to common/src/main/resources/org/bouncycastle/math/ec/package.html diff --git a/src/org/bouncycastle/oiw/package.html b/common/src/main/resources/org/bouncycastle/oiw/package.html similarity index 100% rename from src/org/bouncycastle/oiw/package.html rename to common/src/main/resources/org/bouncycastle/oiw/package.html diff --git a/src/org/bouncycastle/util/encoders/package.html b/common/src/main/resources/org/bouncycastle/util/encoders/package.html similarity index 100% rename from src/org/bouncycastle/util/encoders/package.html rename to common/src/main/resources/org/bouncycastle/util/encoders/package.html diff --git a/common/src/test/java/com/codenameone/FilechooserTest.java b/common/src/test/java/com/codenameone/FilechooserTest.java new file mode 100644 index 0000000..82615b3 --- /dev/null +++ b/common/src/test/java/com/codenameone/FilechooserTest.java @@ -0,0 +1,21 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.codenameone; + +import com.codename1.testing.AbstractTest; + +/** + * + * @author shannah + */ +public class FilechooserTest extends AbstractTest { + + @Override + public boolean runTest() throws Exception { + return true; + } + +} diff --git a/ios/bouncy-castle-ios.iml b/ios/bouncy-castle-ios.iml new file mode 100644 index 0000000..3a04f87 --- /dev/null +++ b/ios/bouncy-castle-ios.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ios/pom.xml b/ios/pom.xml new file mode 100644 index 0000000..303c3b0 --- /dev/null +++ b/ios/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + com.codenameone + bouncy-castle + 1.0 + + com.codenameone + bouncy-castle-ios + 1.0 + + bouncy-castle-ios + + + + src/main/objectivec + + + src/main/resources + + + + + + + ${project.groupId} + ${cn1lib.name}-common + ${project.version} + + + + + diff --git a/javascript/bouncy-castle-javascript.iml b/javascript/bouncy-castle-javascript.iml new file mode 100644 index 0000000..98fcddc --- /dev/null +++ b/javascript/bouncy-castle-javascript.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/javascript/pom.xml b/javascript/pom.xml new file mode 100644 index 0000000..2cf0599 --- /dev/null +++ b/javascript/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + com.codenameone + bouncy-castle + 1.0 + + com.codenameone + bouncy-castle-javascript + 1.0 + + bouncy-castle-javascript + + + + src/main/javascript + + + src/main/resources + + + + + + + ${project.groupId} + ${cn1lib.name}-common + ${project.version} + + + + + diff --git a/javase/bouncy-castle-javase.iml b/javase/bouncy-castle-javase.iml new file mode 100644 index 0000000..c213606 --- /dev/null +++ b/javase/bouncy-castle-javase.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/javase/pom.xml b/javase/pom.xml new file mode 100644 index 0000000..a9b988a --- /dev/null +++ b/javase/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + com.codenameone + bouncy-castle + 1.0 + + com.codenameone + bouncy-castle-javase + 1.0 + + bouncy-castle-javase + + + UTF-8 + 1.8 + 1.8 + + + + + + + com.codenameone + codenameone-javase + provided + + + ${project.groupId} + ${cn1lib.name}-common + ${project.version} + + + + + + diff --git a/lib/bouncy-castle-lib.iml b/lib/bouncy-castle-lib.iml new file mode 100644 index 0000000..918bb76 --- /dev/null +++ b/lib/bouncy-castle-lib.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/pom.xml b/lib/pom.xml new file mode 100644 index 0000000..8bba7d9 --- /dev/null +++ b/lib/pom.xml @@ -0,0 +1,122 @@ + + + 4.0.0 + + com.codenameone + bouncy-castle + 1.0 + + com.codenameone + bouncy-castle-lib + 1.0 + pom + bouncy-castle-lib + + + UTF-8 + 1.8 + 1.8 + + + + + + + ${project.groupId} + ${cn1lib.name}-common + ${project.version} + + + ${project.groupId} + ${cn1lib.name}-common + ${project.version} + cn1css + zip + + + + + + javase + + + codename1.platform + javase + + + + + ${project.groupId} + ${cn1lib.name}-javase + ${project.version} + + + + + javascript + + + codename1.platform + javascript + + + + + ${project.groupId} + ${cn1lib.name}-javascript + ${project.version} + + + + + ios + + + codename1.platform + ios + + + + + ${project.groupId} + ${cn1lib.name}-ios + ${project.version} + + + + + win + + + codename1.platform + win + + + + + ${project.groupId} + ${cn1lib.name}-win + ${project.version} + + + + + android + + + codename1.platform + android + + + + + ${project.groupId} + ${cn1lib.name}-android + ${project.version} + + + + + + + diff --git a/manifest.mf b/manifest.mf deleted file mode 100644 index 1574df4..0000000 --- a/manifest.mf +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -X-COMMENT: Main-Class will be added automatically by build - diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml deleted file mode 100644 index a9534f2..0000000 --- a/nbproject/build-impl.xml +++ /dev/null @@ -1,1400 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No tests executed. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - Must select one file in the IDE or set profile.class - This target only works when run from inside the NetBeans IDE. - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - Must select some files in the IDE or set test.includes - - - - - Must select one file in the IDE or set run.class - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - Must select some files in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - Must select one file in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties deleted file mode 100644 index 798d123..0000000 --- a/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=65812561 -build.xml.script.CRC32=c17a4175 -build.xml.stylesheet.CRC32=28e38971@1.44.1.45 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=65812561 -nbproject/build-impl.xml.script.CRC32=d56d33ea -nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46 diff --git a/nbproject/nativej2me.res b/nbproject/nativej2me.res deleted file mode 100644 index 6b33caf..0000000 Binary files a/nbproject/nativej2me.res and /dev/null differ diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index 42d7367..0000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,79 +0,0 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=false -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -application.title=BouncyCastleCN1Lib -application.vendor=Codename One -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/BouncyCastleCN1Lib.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -file.reference.CLDC11.jar=lib/CLDC11.jar -file.reference.CodenameOne.jar=lib/CodenameOne.jar -file.reference.CodenameOne_SRC.zip=lib/CodenameOne_SRC.zip -file.reference.BouncyCastleCN1Lib-override=override -includes=** -jar.compress=false -javac.classpath=\ - ${file.reference.CLDC11.jar}:\ - ${file.reference.CodenameOne.jar}:\ - ${file.reference.CodenameOne_SRC.zip}:\ - ${file.reference.BouncyCastleCN1Lib-override} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=windows-1252 -src.dir=src -test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index d0eb561..0000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - org.netbeans.modules.java.j2seproject - - - BouncyCastleCN1Lib - - - - - - - - - diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..3fa7f35 --- /dev/null +++ b/pom.xml @@ -0,0 +1,267 @@ + + + 4.0.0 + + com.codenameone + bouncy-castle + 1.0 + pom + + bouncy-castle + Codename One bouncy-castle library + https://www.codenameone.com + + + + GPL v2 With Classpath Exception + https://openjdk.java.net/legal/gplv2+ce.html + repo + A business-friendly OSS license + + + + + + shannah78 + Steve Hannah + steve.hannah@codenameone.com + -8 + + + + + + https://github.com/codenameone/:bouncy-castle-codenameone-lib + scm:git:git@github.com:codenameone/:bouncy-castle-codenameone-lib.git + + + + + + 7.0.38 + 7.0.38 + UTF-8 + + 1.8 + 11 + 3.8.0 + 8 + 8 + bouncy-castle + 1.3.72 + true + + + common + android + ios + javascript + javase + win + lib + tests + + + + + com.codenameone + codenameone-core + ${cn1.version} + + + com.codenameone + codenameone-javase + ${cn1.version} + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + + + + org.jetbrains + annotations + 13.0 + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + org.codehaus.mojo + exec-maven-plugin + 3.0.0 + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + + compile + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/main/java + + + + + test-compile + + test-compile + + + + ${project.basedir}/src/test/kotlin + ${project.basedir}/src/test/java + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + + com.codenameone + codenameone-maven-plugin + ${cn1.plugin.version} + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + + build-javadoc + + jar + + post-integration-test + + true + + + + + + 1.8 + protected + false + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + + + + + + + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.4 + + + sign-artifacts + verify + + sign + + + ${gpg.passphrase} + + + + + + + + + + + nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + diff --git a/print-version.sh b/print-version.sh new file mode 100644 index 0000000..3a2adc6 --- /dev/null +++ b/print-version.sh @@ -0,0 +1,15 @@ +#!/bin/bash +#Prints the current project version +# +# Created by Steve Hannah +# Creation Date March 19, 2021 +# Usage: bash print-version.sh +# Output Example: 7.0.13-SNAPSHOT +SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" +cd $SCRIPTPATH +regex='bouncy-castle (.*):$' + +LINE=$(mvn validate | grep "Reactor Summary") +[[ $LINE =~ $regex ]] + +echo "${BASH_REMATCH[1]}" diff --git a/tests/.mvn/jvm.config b/tests/.mvn/jvm.config new file mode 100644 index 0000000..e69de29 diff --git a/tests/bouncy-castle-tests.iml b/tests/bouncy-castle-tests.iml new file mode 100644 index 0000000..f409c0e --- /dev/null +++ b/tests/bouncy-castle-tests.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/common/bouncy-castle-tests-common.iml b/tests/common/bouncy-castle-tests-common.iml new file mode 100644 index 0000000..4f95a03 --- /dev/null +++ b/tests/common/bouncy-castle-tests-common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/common/codenameone_settings.properties b/tests/common/codenameone_settings.properties new file mode 100644 index 0000000..fb108b5 --- /dev/null +++ b/tests/common/codenameone_settings.properties @@ -0,0 +1,29 @@ +codename1.android.keystore= +codename1.android.keystoreAlias= +codename1.android.keystorePassword= +codename1.arg.ios.newStorageLocation=true +codename1.arg.java.version=8 +codename1.displayName=LibraryTests +codename1.icon=icon.png +codename1.ios.appid=Q5GHSKAL2F.com.codenameone +codename1.ios.certificate= +codename1.ios.certificatePassword= +codename1.ios.debug.certificate= +codename1.ios.debug.certificatePassword= +codename1.ios.debug.provision= +codename1.ios.provision= +codename1.ios.release.certificate= +codename1.ios.release.certificatePassword= +codename1.ios.release.provision= +codename1.j2me.nativeTheme=nbproject/nativej2me.res +codename1.kotlin=false +codename1.languageLevel=5 +codename1.mainName=LibraryTests +codename1.packageName=com.codenameone +codename1.rim.certificatePassword= +codename1.rim.signtoolCsk= +codename1.rim.signtoolDb= +codename1.secondaryTitle=Hello World +codename1.vendor=CodenameOne +codename1.version=1.0 +codename1.cssTheme=true diff --git a/tests/common/nbactions.xml b/tests/common/nbactions.xml new file mode 100644 index 0000000..29e1b86 --- /dev/null +++ b/tests/common/nbactions.xml @@ -0,0 +1,20 @@ + + + + run + build-with-dependencies + + jar + + + org.codehaus.mojo:exec-maven-plugin:3.0.0:exec + + + ${Env.M2_HOME}/bin/mvn + verify -P simulator -Dcodename1.platform=javase + ../javase + + + + + diff --git a/tests/common/pom.xml b/tests/common/pom.xml new file mode 100644 index 0000000..0176b58 --- /dev/null +++ b/tests/common/pom.xml @@ -0,0 +1,322 @@ + + + 4.0.0 + + com.codenameone + bouncy-castle-tests + 1.0 + + com.codenameone + bouncy-castle-tests-common + 1.0 + jar + + + + + + kotlin + + + cn1.kotlin + + + + 1.3.72 + true + + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + + + + org.jetbrains + annotations + 13.0 + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + initialize + + read-project-properties + + + + ${basedir}/codenameone_settings.properties + + + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + + compile + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/main/java + + + + + test-compile + + test-compile + + + + ${project.basedir}/src/test/kotlin + ${project.basedir}/src/test/java + + + + + + + + + + + + + javase + + + codename1.platform + javase + + + + javase + + + + + org.codehaus.mojo + exec-maven-plugin + + java + true + + -XX:MaxPermSize=128M + -Xmx1024M + + -classpath + + ${exec.mainClass} + ${cn1.mainClass} + + + + + + + + + + simulator + + javase + + + + + + ios-debug + + + iphone + + + ios + + + + + ios-release + + + iphone + true + + + ios + true + + + + + javascript + + javascript + javascript + + + + + android + + android + android + + + + + uwp + + windows + win + + + + + windows + + desktop_windows + javase + + + + + mac + + desktop_macosx + javase + + + + + + com.codenameone + codenameone-core + + + com.codenameone + codenameone-javase + runtime + + + + ${cn1lib.name}-lib + com.codenameone + 1.0-SNAPSHOT + pom + + + + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + initialize + + read-project-properties + + + + ${basedir}/codenameone_settings.properties + + + + + + + + com.codenameone + codenameone-maven-plugin + + + + + cn1-process-classes + process-classes + + compliance-check + css + + + + + attach-test-artifact + test + + attach-test-artifact + + + + + + + + + + + + + + + + cn1libs + cn1libs + file:${project.basedir}/../cn1libs + + + + + + + + diff --git a/tests/common/src/main/css/theme.css b/tests/common/src/main/css/theme.css new file mode 100644 index 0000000..7ba9ade --- /dev/null +++ b/tests/common/src/main/css/theme.css @@ -0,0 +1,9 @@ +#Constants { + includeNativeBool: true; +} +Button { + color:green; + border:1px solid green; + border-radius: 2mm; + margin: 5mm; +} \ No newline at end of file diff --git a/tests/common/src/main/java/com/codenameone/LibraryTests.java b/tests/common/src/main/java/com/codenameone/LibraryTests.java new file mode 100644 index 0000000..2209803 --- /dev/null +++ b/tests/common/src/main/java/com/codenameone/LibraryTests.java @@ -0,0 +1,66 @@ +package com.codenameone; + +import static com.codename1.ui.CN.*; +import com.codename1.ui.*; +import com.codename1.ui.layouts.*; +import com.codename1.io.*; +import com.codename1.ui.plaf.*; +import com.codename1.ui.util.Resources; + +/** + * This file was generated by Codename One for the purpose + * of building native mobile applications using Java. + */ +public class LibraryTests { + + private Form current; + private Resources theme; + + public void init(Object context) { + // use two network threads instead of one + updateNetworkThreadCount(2); + + theme = UIManager.initFirstTheme("/theme"); + + // Enable Toolbar on all Forms by default + Toolbar.setGlobalToolbar(true); + + // Pro only feature + Log.bindCrashProtection(true); + + addNetworkErrorListener(err -> { + // prevent the event from propagating + err.consume(); + if(err.getError() != null) { + Log.e(err.getError()); + } + Log.sendLogAsync(); + Dialog.show("Connection Error", "There was a networking error in the connection to " + err.getConnectionRequest().getUrl(), "OK", null); + }); + } + + + public void start() { + if(current != null){ + current.show(); + return; + } + //WebSocket sock; + Form hi = new Form("Hi World", BoxLayout.y()); + hi.add(new Label("Hello World")); + + hi.show(); + } + + public void stop() { + current = getCurrentForm(); + if(current instanceof Dialog) { + ((Dialog)current).dispose(); + current = getCurrentForm(); + } + } + + public void destroy() { + } + +} diff --git a/tests/common/src/test/java/com/codenameone/MyFirstTest.java b/tests/common/src/test/java/com/codenameone/MyFirstTest.java new file mode 100644 index 0000000..9cff27e --- /dev/null +++ b/tests/common/src/test/java/com/codenameone/MyFirstTest.java @@ -0,0 +1,23 @@ + +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.codenameone; + +import com.codename1.testing.AbstractTest; + +/** + * + * @author shannah + */ +public class MyFirstTest extends AbstractTest { + + @Override + public boolean runTest() throws Exception { + return true; + } + + +} diff --git a/tests/javase/bouncy-castle-tests-javase.iml b/tests/javase/bouncy-castle-tests-javase.iml new file mode 100644 index 0000000..bd63a29 --- /dev/null +++ b/tests/javase/bouncy-castle-tests-javase.iml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/javase/pom.xml b/tests/javase/pom.xml new file mode 100644 index 0000000..e394993 --- /dev/null +++ b/tests/javase/pom.xml @@ -0,0 +1,149 @@ + + + 4.0.0 + + com.codenameone + bouncy-castle-tests + 1.0 + + com.codenameone + bouncy-castle-tests-javase + 1.0 + + bouncy-castle-tests-javase + + + UTF-8 + 1.8 + 1.8 + javase + + + ${project.basedir}/../common/src/test/java + + + + + com.codenameone + codenameone-javase + + + ${project.groupId} + ${cn1app.name}-common + ${project.version} + + + ${project.groupId} + ${cn1app.name}-common + ${project.version} + tests + test + + + + + + + test + + true + + + javase + com.codename1.impl.javase.Simulator + + + + + com.codenameone + codenameone-maven-plugin + + + + + cn1-tests + test + + test + + + + + + + + + + + debug-simulator + + debug + + + -Xdebug + 8888 + -Xrunjdwp:transport=dt_socket,address=${codename1.jdwp.port},server=y,suspend=n + + + + simulator + + javase + com.codename1.impl.javase.Simulator + + + + + com.codenameone + codenameone-maven-plugin + + + prepare-simulator-environment + initialize + + prepare-simulator-classpath + + + + + + + org.codehaus.mojo + exec-maven-plugin + + ${basedir}/../common + + java + true + + -XX:MaxPermSize=128M + -Xmx1024M + -Dcef.dir=${cef.dir} + -Dcodename1.designer.jar=${codename1.designer.jar} + -Dcodename1.css.compiler.args.input=${codename1.css.compiler.args.input} + -Dcodename1.css.compiler.args.output=${codename1.css.compiler.args.output} + -Dcodename1.css.compiler.args.merge=${codename1.css.compiler.args.merge} + ${codename1.exec.args.debug} + ${codename1.exec.args.runjdwp.transport} + -classpath + + ${exec.mainClass} + ${codename1.mainClass} + + + + + run-in-simulator + verify + + exec + + + + + + + + + + diff --git a/tests/pom.xml b/tests/pom.xml new file mode 100644 index 0000000..8ff8c16 --- /dev/null +++ b/tests/pom.xml @@ -0,0 +1,106 @@ + + + 4.0.0 + + bouncy-castle + com.codenameone + 1.0 + + + com.codenameone + bouncy-castle-tests + 1.0 + pom + + bouncy-castle-tests-tests + bouncy-castle-tests-tests + https://www.codenameone.com + + + + GPL v2 With Classpath Exception + https://openjdk.java.net/legal/gplv2+ce.html + repo + A business-friendly OSS license + + + + + common + javase + + + + + + 7.0.8-b6 + UTF-8 + + 1.8 + 11 + 1.7.11 + 3.8.0 + 8 + 8 + bouncy-castle-tests + + + + + + + + + + + + com.codenameone + codenameone-core + ${cn1.version} + + + com.codenameone + codenameone-javase + ${cn1.version} + + + + + + + + + + + + com.codenameone + codenameone-maven-plugin + ${cn1.plugin.version} + + + + + + + + + + + + + + + + diff --git a/update-version.sh b/update-version.sh new file mode 100755 index 0000000..0be4e05 --- /dev/null +++ b/update-version.sh @@ -0,0 +1,57 @@ +#!/bin/bash +# update-version.sh +# Created by Steve Hannah. March 24, 2021 +# +# Synopsis: +# --------- +# +# Updates the version of this project and commits the version changes in Git. If the version +# is a release version (i.e. not ending in '-SNAPSHOT', then it will also add a git tag). +# +# Typically you would run this before and after running the deploy-to-sonatype.sh script. Before +# to set the release version, and after to change to a new SNAPSHOT version. +# +# +# Usage: +# bash update-version.sh VERSION +# +# Arguments: +# VERSION The version number to update to. +# +# Examples: +# bash update-version.sh 8.0.1 +# Updates to version 8.0.1 +# +# bash update-version.sh 8.0.2-SNAPSHOT +# Updates to version 8.0.2-SNAPSHOT +# +# Typical Workflow is: +# bash update-version.sh 8.0.1 && bash deploy-to-sonatype.sh && bash update-version.sh 8.0.2-SNAPSHOT +set -e +if [ -z $1 ]; then + echo "Usage bash update-version.sh VERSION" + echo " Where VERSION is the version number to update to." + echo " E.g. bash update-version.sh 7.0.15-SNAPSHOT" + exit 1 +fi +version=$1 +oldVersion=$(bash print-version.sh) +if [ $version == $oldVersion ]; then + echo "Version is same as old version. Not updating version" + exit 0 +fi +echo "Version: $version" +mvn versions:set -DnewVersion=$version +mvn versions:commit + +echo "Committing version change in git" +git add -u . +# Note: the -u is to prevent adding files that aren't added to git yet. Only changed +# files. This is to help avoid accidents. +git commit -m "Updated version to $version" +if [[ "$version" == *-SNAPSHOT ]]; then + echo "This is a snapshot version so not adding a tag" +else + echo "Adding git tag for 'v${version}'" + git tag -a "v${version}" -m "Version ${version}" +fi \ No newline at end of file diff --git a/win/bouncy-castle-win.iml b/win/bouncy-castle-win.iml new file mode 100644 index 0000000..563622e --- /dev/null +++ b/win/bouncy-castle-win.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win/pom.xml b/win/pom.xml new file mode 100644 index 0000000..e4b8535 --- /dev/null +++ b/win/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + com.codenameone + bouncy-castle + 1.0 + + com.codenameone + bouncy-castle-win + 1.0 + + bouncy-castle-win + + + + src/main/csharp + + + src/main/resources + + + + + + + ${project.groupId} + ${cn1lib.name}-common + ${project.version} + + + + +