Free as in Freedom: Codeberg.org. Create your repos!
Browse Source

WIP: Move code to submodule and improve build script

tags/0.0.1-alpha1
Paul Schaub 11 months ago
parent
commit
8b40bfc9ef
Signed by: Paul Schaub <vanitasvitae@fsfe.org> GPG Key ID: 62BEE9264BF17311
100 changed files with 367 additions and 289 deletions
  1. 97
    31
      build.gradle
  2. 1
    1
      config/checkstyle.xml
  3. 10
    0
      painless-core/build.gradle
  4. 11
    11
      painless-core/src/main/java/org/pgpainless/PGPainless.java
  5. 1
    1
      painless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.java
  6. 1
    1
      painless-core/src/main/java/org/pgpainless/algorithm/CompressionAlgorithm.java
  7. 1
    1
      painless-core/src/main/java/org/pgpainless/algorithm/Feature.java
  8. 1
    1
      painless-core/src/main/java/org/pgpainless/algorithm/HashAlgorithm.java
  9. 1
    1
      painless-core/src/main/java/org/pgpainless/algorithm/KeyFlag.java
  10. 1
    1
      painless-core/src/main/java/org/pgpainless/algorithm/PublicKeyAlgorithm.java
  11. 1
    1
      painless-core/src/main/java/org/pgpainless/algorithm/SymmetricKeyAlgorithm.java
  12. 1
    1
      painless-core/src/main/java/org/pgpainless/algorithm/package-info.java
  13. 4
    4
      painless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionBuilder.java
  14. 3
    3
      painless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionBuilderInterface.java
  15. 1
    1
      painless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStream.java
  16. 5
    5
      painless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java
  17. 1
    1
      painless-core/src/main/java/org/pgpainless/decryption_verification/MissingPublicKeyCallback.java
  18. 4
    4
      painless-core/src/main/java/org/pgpainless/decryption_verification/PainlessResult.java
  19. 2
    2
      painless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java
  20. 1
    1
      painless-core/src/main/java/org/pgpainless/decryption_verification/package-info.java
  21. 14
    14
      painless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionBuilder.java
  22. 9
    9
      painless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionBuilderInterface.java
  23. 5
    5
      painless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java
  24. 1
    1
      painless-core/src/main/java/org/pgpainless/encryption_signing/package-info.java
  25. 1
    1
      painless-core/src/main/java/org/pgpainless/exception/PublicKeyNotFoundException.java
  26. 1
    1
      painless-core/src/main/java/org/pgpainless/exception/SecretKeyNotFoundException.java
  27. 1
    1
      painless-core/src/main/java/org/pgpainless/exception/package-info.java
  28. 1
    1
      painless-core/src/main/java/org/pgpainless/key/OpenPgpV4Fingerprint.java
  29. 2
    2
      painless-core/src/main/java/org/pgpainless/key/collection/KeyRingCollection.java
  30. 2
    2
      painless-core/src/main/java/org/pgpainless/key/collection/PGPKeyRing.java
  31. 1
    1
      painless-core/src/main/java/org/pgpainless/key/collection/package-info.java
  32. 12
    13
      painless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilder.java
  33. 3
    3
      painless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilderInterface.java
  34. 2
    2
      painless-core/src/main/java/org/pgpainless/key/generation/KeySpec.java
  35. 8
    8
      painless-core/src/main/java/org/pgpainless/key/generation/KeySpecBuilder.java
  36. 6
    6
      painless-core/src/main/java/org/pgpainless/key/generation/KeySpecBuilderInterface.java
  37. 1
    1
      painless-core/src/main/java/org/pgpainless/key/generation/package-info.java
  38. 3
    3
      painless-core/src/main/java/org/pgpainless/key/generation/type/ECDH.java
  39. 4
    3
      painless-core/src/main/java/org/pgpainless/key/generation/type/ECDSA.java
  40. 3
    3
      painless-core/src/main/java/org/pgpainless/key/generation/type/ElGamal_ENCRYPT.java
  41. 3
    3
      painless-core/src/main/java/org/pgpainless/key/generation/type/ElGamal_GENERAL.java
  42. 2
    2
      painless-core/src/main/java/org/pgpainless/key/generation/type/KeyType.java
  43. 3
    3
      painless-core/src/main/java/org/pgpainless/key/generation/type/RSA_ENCRYPT.java
  44. 3
    3
      painless-core/src/main/java/org/pgpainless/key/generation/type/RSA_GENERAL.java
  45. 3
    3
      painless-core/src/main/java/org/pgpainless/key/generation/type/RSA_SIGN.java
  46. 1
    1
      painless-core/src/main/java/org/pgpainless/key/generation/type/curve/EllipticCurve.java
  47. 1
    1
      painless-core/src/main/java/org/pgpainless/key/generation/type/curve/package-info.java
  48. 1
    1
      painless-core/src/main/java/org/pgpainless/key/generation/type/length/DiffieHellmanLength.java
  49. 1
    1
      painless-core/src/main/java/org/pgpainless/key/generation/type/length/ElGamalLength.java
  50. 1
    1
      painless-core/src/main/java/org/pgpainless/key/generation/type/length/KeyLength.java
  51. 1
    1
      painless-core/src/main/java/org/pgpainless/key/generation/type/length/RsaLength.java
  52. 1
    1
      painless-core/src/main/java/org/pgpainless/key/generation/type/length/package-info.java
  53. 1
    1
      painless-core/src/main/java/org/pgpainless/key/generation/type/package-info.java
  54. 1
    1
      painless-core/src/main/java/org/pgpainless/key/package-info.java
  55. 2
    2
      painless-core/src/main/java/org/pgpainless/key/parsing/KeyRingReader.java
  56. 1
    1
      painless-core/src/main/java/org/pgpainless/key/parsing/package-info.java
  57. 3
    3
      painless-core/src/main/java/org/pgpainless/key/protection/KeyRingProtectionSettings.java
  58. 2
    2
      painless-core/src/main/java/org/pgpainless/key/protection/PassphraseMapKeyRingProtector.java
  59. 1
    1
      painless-core/src/main/java/org/pgpainless/key/protection/SecretKeyRingProtector.java
  60. 1
    1
      painless-core/src/main/java/org/pgpainless/key/protection/UnprotectedKeysProtector.java
  61. 1
    1
      painless-core/src/main/java/org/pgpainless/key/protection/package-info.java
  62. 2
    2
      painless-core/src/main/java/org/pgpainless/key/selection/key/KeySelectionStrategy.java
  63. 2
    2
      painless-core/src/main/java/org/pgpainless/key/selection/key/PublicKeySelectionStrategy.java
  64. 2
    2
      painless-core/src/main/java/org/pgpainless/key/selection/key/SecretKeySelectionStrategy.java
  65. 3
    3
      painless-core/src/main/java/org/pgpainless/key/selection/key/impl/And.java
  66. 2
    2
      painless-core/src/main/java/org/pgpainless/key/selection/key/impl/EncryptionKeySelectionStrategy.java
  67. 3
    3
      painless-core/src/main/java/org/pgpainless/key/selection/key/impl/NoRevocation.java
  68. 3
    3
      painless-core/src/main/java/org/pgpainless/key/selection/key/impl/Or.java
  69. 2
    2
      painless-core/src/main/java/org/pgpainless/key/selection/key/impl/SignatureKeySelectionStrategy.java
  70. 2
    2
      painless-core/src/main/java/org/pgpainless/key/selection/key/impl/SignedByMasterKey.java
  71. 1
    1
      painless-core/src/main/java/org/pgpainless/key/selection/key/impl/package-info.java
  72. 1
    1
      painless-core/src/main/java/org/pgpainless/key/selection/key/package-info.java
  73. 2
    2
      painless-core/src/main/java/org/pgpainless/key/selection/keyring/KeyRingSelectionStrategy.java
  74. 2
    2
      painless-core/src/main/java/org/pgpainless/key/selection/keyring/PublicKeyRingSelectionStrategy.java
  75. 2
    2
      painless-core/src/main/java/org/pgpainless/key/selection/keyring/SecretKeyRingSelectionStrategy.java
  76. 1
    1
      painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/Email.java
  77. 4
    3
      painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/ExactUserId.java
  78. 3
    3
      painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/PartialUserId.java
  79. 4
    4
      painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/Whitelist.java
  80. 3
    3
      painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/Wildcard.java
  81. 1
    1
      painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/XMPP.java
  82. 1
    1
      painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/package-info.java
  83. 1
    1
      painless-core/src/main/java/org/pgpainless/key/selection/keyring/package-info.java
  84. 2
    2
      painless-core/src/main/java/org/pgpainless/package-info.java
  85. 4
    4
      painless-core/src/main/java/org/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java
  86. 1
    1
      painless-core/src/main/java/org/pgpainless/symmetric_encryption/package-info.java
  87. 6
    6
      painless-core/src/main/java/org/pgpainless/util/BCUtil.java
  88. 1
    1
      painless-core/src/main/java/org/pgpainless/util/KeyRingSubKeyFix.java
  89. 1
    1
      painless-core/src/main/java/org/pgpainless/util/MultiMap.java
  90. 1
    1
      painless-core/src/main/java/org/pgpainless/util/Passphrase.java
  91. 1
    1
      painless-core/src/main/java/org/pgpainless/util/package-info.java
  92. 1
    1
      painless-core/src/test/java/org/pgpainless/AbstractPGPainlessTest.java
  93. 10
    9
      painless-core/src/test/java/org/pgpainless/BCUtilTest.java
  94. 1
    1
      painless-core/src/test/java/org/pgpainless/BouncycastleExportSubkeys.java
  95. 16
    16
      painless-core/src/test/java/org/pgpainless/EncryptDecryptTest.java
  96. 2
    2
      painless-core/src/test/java/org/pgpainless/ImportExportKeyTest.java
  97. 4
    4
      painless-core/src/test/java/org/pgpainless/KeyRingSubKeyFixTest.java
  98. 5
    5
      painless-core/src/test/java/org/pgpainless/LengthTest.java
  99. 2
    2
      painless-core/src/test/java/org/pgpainless/OpenPgpV4FingerprintTest.java
  100. 0
    0
      painless-core/src/test/java/org/pgpainless/SymmetricTest.java

+ 97
- 31
build.gradle View File

@@ -1,43 +1,109 @@
1
-plugins {
2
-    id 'java'
3
-    id 'maven'
4
-    id 'maven-publish'
5
-    id 'ru.vyarus.animalsniffer' version '1.4.3'
6
-}
1
+buildscript {
7 2
 
8
-apply plugin: 'eclipse'
3
+    repositories {
9 4
 
10
-apply plugin: 'ru.vyarus.animalsniffer'
11
-dependencies {
12
-    signature "net.sf.androidscents.signature:android-api-level-9:2.3.1_r2@signature"
13
-}
5
+        maven {
6
+            url "https://plugins.gradle.org/m2/"
7
+        }
14 8
 
15
-animalsniffer {
16
-    sourceSets = [sourceSets.main]
9
+        jcenter()
10
+        mavenLocal()
11
+        mavenCentral()
12
+    }
17 13
 }
18 14
 
19
-apply plugin: 'checkstyle'
15
+apply from: 'version.gradle'
20 16
 
21
-checkstyle {
22
-    configFile = 'config/checkstyle.xml' as File
23
-    toolVersion = '8.10'
24
-}
17
+allprojects {
18
+
19
+    apply from: 'plugins.gradle'
25 20
 
26
-group 'org.pgpainless'
27
-version '0.1-SNAPSHOT'
21
+    group 'org.pgpainless'
22
+    description = "Simple to use OpenPGP API for Java based on Bouncycastle"
23
+    version = shortVersion
28 24
 
29
-sourceCompatibility = 1.8
25
+    sourceCompatibility = javaSourceCompatibility
30 26
 
31
-repositories {
32
-    mavenCentral()
27
+    repositories {
28
+        mavenCentral()
29
+    }
33 30
 }
34 31
 
35
-dependencies {
36
-    testCompile group: 'junit', name: 'junit', version: '4.12'
37
-    /*
38
-    compile 'org.bouncycastle:bcprov-debug-jdk15on:1.60'
39
-    /*/
40
-    compile 'org.bouncycastle:bcprov-jdk15on:1.60'
41
-    //*/
42
-    compile 'org.bouncycastle:bcpg-jdk15on:1.60'
32
+subprojects {
33
+    apply plugin: 'maven'
34
+    apply plugin: 'signing'
35
+
36
+    task sourcesJar(type: Jar, dependsOn: classes) {
37
+        classifier = 'sources'
38
+        from sourceSets.main.allSource
39
+    }
40
+    task javadocJar(type: Jar, dependsOn: javadoc) {
41
+        classifier = 'javadoc'
42
+        from javadoc.destinationDir
43
+    }
44
+    task testJar(type: Jar, dependsOn: testClasses) {
45
+        classifier = 'tests'
46
+        from sourceSets.test.output
47
+    }
48
+
49
+    artifacts {
50
+        archives sourcesJar
51
+        archives javadocJar
52
+        archives testJar
53
+    }
54
+
55
+    uploadArchives {
56
+        repositories {
57
+            mavenDeployer {
58
+                if (signingRequired) {
59
+                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
60
+                }
61
+                repository(url: project.sonatypeStagingUrl) {
62
+                    if (sonatypeCredentialsAvailable) {
63
+                        authentication(userName: sonatypeUsername, password: sonatypePassword)
64
+                    }
65
+                }
66
+                snapshotRepository(url: project.sonatypeSnapshotUrl) {
67
+                    if (sonatypeCredentialsAvailable) {
68
+                        authentication(userName: sonatypeUsername, password: sonatypePassword)
69
+                    }
70
+                }
71
+
72
+                pom.project {
73
+                    name 'PGPainless'
74
+                    description 'Simple to use OpenPGP API for Java based on Bouncycastle'
75
+                    url 'https://github.com/pgpainless/pgpainless'
76
+                    inceptionYear '2018'
77
+
78
+                    scm {
79
+                        url 'https://github.com/pgpainless/pgpainless'
80
+                        connection 'scm:https://github.com/pgpainless/pgpainless'
81
+                        developerConnection 'scm:git://github.com/pgpainless/pgpainless.git'
82
+                    }
83
+
84
+                    licenses {
85
+                        license {
86
+                            name 'The Apache Software License, Version 2.0'
87
+                            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
88
+                            distribution 'repo'
89
+                        }
90
+                    }
91
+
92
+                    developers {
93
+                        developer {
94
+                            id 'vanitasvitae'
95
+                            name 'Paul Schaub'
96
+                            email 'vanitasvitae@fsfe.org'
97
+                        }
98
+                    }
99
+                }
100
+            }
101
+        }
102
+    }
103
+
104
+    signing {
105
+        required { signingRequired }
106
+        sign configurations.archives
107
+    }
43 108
 }
109
+

+ 1
- 1
config/checkstyle.xml View File

@@ -224,7 +224,7 @@
224 224
         <module name="CustomImportOrder">
225 225
             <property name="customImportOrderRules"
226 226
                       value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
227
-            <property name="specialImportsRegExp" value="^org\.pgpainless\.pgpainless"/>
227
+            <property name="specialImportsRegExp" value="^org\.org.pgpainless.core\.org.pgpainless.core"/>
228 228
             <property name="sortImportsInGroupAlphabetically" value="true"/>
229 229
             <property name="separateLineBetweenGroups" value="true"/>
230 230
         </module>

+ 10
- 0
painless-core/build.gradle View File

@@ -0,0 +1,10 @@
1
+
2
+dependencies {
3
+    testCompile group: 'junit', name: 'junit', version: '4.12'
4
+    /*
5
+    compile 'org.bouncycastle:bcprov-debug-jdk15on:1.60'
6
+    /*/
7
+    compile 'org.bouncycastle:bcprov-jdk15on:1.60'
8
+    //*/
9
+    compile 'org.bouncycastle:bcpg-jdk15on:1.60'
10
+}

src/main/java/org/pgpainless/pgpainless/PGPainless.java → painless-core/src/main/java/org/pgpainless/PGPainless.java View File

@@ -13,19 +13,19 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless;
16
+package org.pgpainless;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPException;
19
-import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm;
20
-import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm;
21
-import org.pgpainless.pgpainless.decryption_verification.DecryptionBuilder;
22
-import org.pgpainless.pgpainless.decryption_verification.DecryptionStream;
23
-import org.pgpainless.pgpainless.encryption_signing.EncryptionBuilder;
24
-import org.pgpainless.pgpainless.encryption_signing.EncryptionStream;
25
-import org.pgpainless.pgpainless.key.parsing.KeyRingReader;
26
-import org.pgpainless.pgpainless.key.generation.KeyRingBuilder;
27
-import org.pgpainless.pgpainless.symmetric_encryption.SymmetricEncryptorDecryptor;
28
-import org.pgpainless.pgpainless.util.Passphrase;
19
+import org.pgpainless.algorithm.CompressionAlgorithm;
20
+import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
21
+import org.pgpainless.decryption_verification.DecryptionBuilder;
22
+import org.pgpainless.decryption_verification.DecryptionStream;
23
+import org.pgpainless.encryption_signing.EncryptionBuilder;
24
+import org.pgpainless.encryption_signing.EncryptionStream;
25
+import org.pgpainless.key.generation.KeyRingBuilder;
26
+import org.pgpainless.key.parsing.KeyRingReader;
27
+import org.pgpainless.symmetric_encryption.SymmetricEncryptorDecryptor;
28
+import org.pgpainless.util.Passphrase;
29 29
 
30 30
 import java.io.IOException;
31 31
 

src/main/java/org/pgpainless/pgpainless/algorithm/AlgorithmSuite.java → painless-core/src/main/java/org/pgpainless/algorithm/AlgorithmSuite.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.algorithm;
16
+package org.pgpainless.algorithm;
17 17
 
18 18
 import java.util.ArrayList;
19 19
 import java.util.Arrays;

src/main/java/org/pgpainless/pgpainless/algorithm/CompressionAlgorithm.java → painless-core/src/main/java/org/pgpainless/algorithm/CompressionAlgorithm.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.algorithm;
16
+package org.pgpainless.algorithm;
17 17
 
18 18
 import java.util.HashMap;
19 19
 import java.util.Map;

src/main/java/org/pgpainless/pgpainless/algorithm/Feature.java → painless-core/src/main/java/org/pgpainless/algorithm/Feature.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.algorithm;
16
+package org.pgpainless.algorithm;
17 17
 
18 18
 import java.util.HashMap;
19 19
 import java.util.Map;

src/main/java/org/pgpainless/pgpainless/algorithm/HashAlgorithm.java → painless-core/src/main/java/org/pgpainless/algorithm/HashAlgorithm.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.algorithm;
16
+package org.pgpainless.algorithm;
17 17
 
18 18
 import java.util.HashMap;
19 19
 import java.util.Map;

src/main/java/org/pgpainless/pgpainless/algorithm/KeyFlag.java → painless-core/src/main/java/org/pgpainless/algorithm/KeyFlag.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.algorithm;
16
+package org.pgpainless.algorithm;
17 17
 
18 18
 import java.util.ArrayList;
19 19
 import java.util.List;

src/main/java/org/pgpainless/pgpainless/algorithm/PublicKeyAlgorithm.java → painless-core/src/main/java/org/pgpainless/algorithm/PublicKeyAlgorithm.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.algorithm;
16
+package org.pgpainless.algorithm;
17 17
 
18 18
 import java.util.HashMap;
19 19
 import java.util.Map;

src/main/java/org/pgpainless/pgpainless/algorithm/SymmetricKeyAlgorithm.java → painless-core/src/main/java/org/pgpainless/algorithm/SymmetricKeyAlgorithm.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.algorithm;
16
+package org.pgpainless.algorithm;
17 17
 
18 18
 import java.util.HashMap;
19 19
 import java.util.Map;

src/main/java/org/pgpainless/pgpainless/algorithm/package-info.java → painless-core/src/main/java/org/pgpainless/algorithm/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Enums which map to OpenPGP's algorithm IDs.
18 18
  */
19
-package org.pgpainless.pgpainless.algorithm;
19
+package org.pgpainless.algorithm;

src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilder.java → painless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionBuilder.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.decryption_verification;
16
+package org.pgpainless.decryption_verification;
17 17
 
18 18
 import java.io.IOException;
19 19
 import java.io.InputStream;
@@ -25,8 +25,8 @@ import org.bouncycastle.openpgp.PGPException;
25 25
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
26 26
 import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
27 27
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
28
-import org.pgpainless.pgpainless.key.OpenPgpV4Fingerprint;
29
-import org.pgpainless.pgpainless.key.protection.SecretKeyRingProtector;
28
+import org.pgpainless.key.OpenPgpV4Fingerprint;
29
+import org.pgpainless.key.protection.SecretKeyRingProtector;
30 30
 
31 31
 public class DecryptionBuilder implements DecryptionBuilderInterface {
32 32
 
@@ -34,7 +34,7 @@ public class DecryptionBuilder implements DecryptionBuilderInterface {
34 34
     private PGPSecretKeyRingCollection decryptionKeys;
35 35
     private SecretKeyRingProtector decryptionKeyDecryptor;
36 36
     private Set<PGPPublicKeyRing> verificationKeys = new HashSet<>();
37
-    private org.pgpainless.pgpainless.decryption_verification.MissingPublicKeyCallback missingPublicKeyCallback = null;
37
+    private MissingPublicKeyCallback missingPublicKeyCallback = null;
38 38
 
39 39
     @Override
40 40
     public DecryptWith onInputStream(InputStream inputStream) {

src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilderInterface.java → painless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionBuilderInterface.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.decryption_verification;
16
+package org.pgpainless.decryption_verification;
17 17
 
18 18
 import java.io.IOException;
19 19
 import java.io.InputStream;
@@ -23,8 +23,8 @@ import org.bouncycastle.openpgp.PGPException;
23 23
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
24 24
 import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
25 25
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
26
-import org.pgpainless.pgpainless.key.OpenPgpV4Fingerprint;
27
-import org.pgpainless.pgpainless.key.protection.SecretKeyRingProtector;
26
+import org.pgpainless.key.OpenPgpV4Fingerprint;
27
+import org.pgpainless.key.protection.SecretKeyRingProtector;
28 28
 
29 29
 public interface DecryptionBuilderInterface {
30 30
 

src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionStream.java → painless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStream.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.decryption_verification;
16
+package org.pgpainless.decryption_verification;
17 17
 
18 18
 import java.io.IOException;
19 19
 import java.io.InputStream;

src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionStreamFactory.java → painless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.decryption_verification;
16
+package org.pgpainless.decryption_verification;
17 17
 
18 18
 import java.io.IOException;
19 19
 import java.io.InputStream;
@@ -46,10 +46,10 @@ import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory;
46 46
 import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
47 47
 import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider;
48 48
 import org.bouncycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory;
49
-import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm;
50
-import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm;
51
-import org.pgpainless.pgpainless.key.OpenPgpV4Fingerprint;
52
-import org.pgpainless.pgpainless.key.protection.SecretKeyRingProtector;
49
+import org.pgpainless.algorithm.CompressionAlgorithm;
50
+import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
51
+import org.pgpainless.key.OpenPgpV4Fingerprint;
52
+import org.pgpainless.key.protection.SecretKeyRingProtector;
53 53
 
54 54
 public final class DecryptionStreamFactory {
55 55
 

src/main/java/org/pgpainless/pgpainless/decryption_verification/MissingPublicKeyCallback.java → painless-core/src/main/java/org/pgpainless/decryption_verification/MissingPublicKeyCallback.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.decryption_verification;
16
+package org.pgpainless.decryption_verification;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPPublicKey;
19 19
 

src/main/java/org/pgpainless/pgpainless/decryption_verification/PainlessResult.java → painless-core/src/main/java/org/pgpainless/decryption_verification/PainlessResult.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.decryption_verification;
16
+package org.pgpainless.decryption_verification;
17 17
 
18 18
 import java.util.Collections;
19 19
 import java.util.HashSet;
@@ -21,9 +21,9 @@ import java.util.Set;
21 21
 
22 22
 import org.bouncycastle.openpgp.PGPPublicKey;
23 23
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
24
-import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm;
25
-import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm;
26
-import org.pgpainless.pgpainless.key.OpenPgpV4Fingerprint;
24
+import org.pgpainless.algorithm.CompressionAlgorithm;
25
+import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
26
+import org.pgpainless.key.OpenPgpV4Fingerprint;
27 27
 
28 28
 public class PainlessResult {
29 29
 

src/main/java/org/pgpainless/pgpainless/decryption_verification/SignatureVerifyingInputStream.java → painless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.decryption_verification;
16
+package org.pgpainless.decryption_verification;
17 17
 
18 18
 import java.io.FilterInputStream;
19 19
 import java.io.IOException;
@@ -28,7 +28,7 @@ import org.bouncycastle.openpgp.PGPObjectFactory;
28 28
 import org.bouncycastle.openpgp.PGPOnePassSignature;
29 29
 import org.bouncycastle.openpgp.PGPSignature;
30 30
 import org.bouncycastle.openpgp.PGPSignatureList;
31
-import org.pgpainless.pgpainless.key.OpenPgpV4Fingerprint;
31
+import org.pgpainless.key.OpenPgpV4Fingerprint;
32 32
 
33 33
 public class SignatureVerifyingInputStream extends FilterInputStream {
34 34
 

src/main/java/org/pgpainless/pgpainless/decryption_verification/package-info.java → painless-core/src/main/java/org/pgpainless/decryption_verification/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Classes used to decryption and verification of OpenPGP encrypted / signed data.
18 18
  */
19
-package org.pgpainless.pgpainless.decryption_verification;
19
+package org.pgpainless.decryption_verification;

src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionBuilder.java → painless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionBuilder.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.encryption_signing;
16
+package org.pgpainless.encryption_signing;
17 17
 
18 18
 import java.io.IOException;
19 19
 import java.io.OutputStream;
@@ -29,19 +29,19 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
29 29
 import org.bouncycastle.openpgp.PGPSecretKey;
30 30
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
31 31
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
32
-import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm;
33
-import org.pgpainless.pgpainless.algorithm.HashAlgorithm;
34
-import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm;
35
-import org.pgpainless.pgpainless.key.protection.SecretKeyRingProtector;
36
-import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy;
37
-import org.pgpainless.pgpainless.key.selection.key.SecretKeySelectionStrategy;
38
-import org.pgpainless.pgpainless.key.selection.key.impl.And;
39
-import org.pgpainless.pgpainless.key.selection.key.impl.EncryptionKeySelectionStrategy;
40
-import org.pgpainless.pgpainless.key.selection.key.impl.NoRevocation;
41
-import org.pgpainless.pgpainless.key.selection.key.impl.SignatureKeySelectionStrategy;
42
-import org.pgpainless.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
43
-import org.pgpainless.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
44
-import org.pgpainless.pgpainless.util.MultiMap;
32
+import org.pgpainless.algorithm.CompressionAlgorithm;
33
+import org.pgpainless.algorithm.HashAlgorithm;
34
+import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
35
+import org.pgpainless.key.protection.SecretKeyRingProtector;
36
+import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
37
+import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
38
+import org.pgpainless.key.selection.key.impl.And;
39
+import org.pgpainless.key.selection.key.impl.EncryptionKeySelectionStrategy;
40
+import org.pgpainless.key.selection.key.impl.NoRevocation;
41
+import org.pgpainless.key.selection.key.impl.SignatureKeySelectionStrategy;
42
+import org.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
43
+import org.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
44
+import org.pgpainless.util.MultiMap;
45 45
 
46 46
 public class EncryptionBuilder implements EncryptionBuilderInterface {
47 47
 

src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionBuilderInterface.java → painless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionBuilderInterface.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.encryption_signing;
16
+package org.pgpainless.encryption_signing;
17 17
 
18 18
 import java.io.IOException;
19 19
 import java.io.OutputStream;
@@ -25,14 +25,14 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
25 25
 import org.bouncycastle.openpgp.PGPSecretKey;
26 26
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
27 27
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
28
-import org.pgpainless.pgpainless.exception.SecretKeyNotFoundException;
29
-import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm;
30
-import org.pgpainless.pgpainless.algorithm.HashAlgorithm;
31
-import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm;
32
-import org.pgpainless.pgpainless.key.protection.SecretKeyRingProtector;
33
-import org.pgpainless.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
34
-import org.pgpainless.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
35
-import org.pgpainless.pgpainless.util.MultiMap;
28
+import org.pgpainless.algorithm.CompressionAlgorithm;
29
+import org.pgpainless.algorithm.HashAlgorithm;
30
+import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
31
+import org.pgpainless.exception.SecretKeyNotFoundException;
32
+import org.pgpainless.key.protection.SecretKeyRingProtector;
33
+import org.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
34
+import org.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
35
+import org.pgpainless.util.MultiMap;
36 36
 
37 37
 public interface EncryptionBuilderInterface {
38 38
 

src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionStream.java → painless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.encryption_signing;
16
+package org.pgpainless.encryption_signing;
17 17
 
18 18
 import java.io.IOException;
19 19
 import java.io.OutputStream;
@@ -40,10 +40,10 @@ import org.bouncycastle.openpgp.PGPSignatureGenerator;
40 40
 import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder;
41 41
 import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder;
42 42
 import org.bouncycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator;
43
-import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm;
44
-import org.pgpainless.pgpainless.algorithm.HashAlgorithm;
45
-import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm;
46
-import org.pgpainless.pgpainless.decryption_verification.PainlessResult;
43
+import org.pgpainless.algorithm.CompressionAlgorithm;
44
+import org.pgpainless.algorithm.HashAlgorithm;
45
+import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
46
+import org.pgpainless.decryption_verification.PainlessResult;
47 47
 
48 48
 /**
49 49
  * This class is based upon Jens Neuhalfen's Bouncy-GPG PGPEncryptingStream.

src/main/java/org/pgpainless/pgpainless/encryption_signing/package-info.java → painless-core/src/main/java/org/pgpainless/encryption_signing/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Classes used to encrypt or sign data using OpenPGP.
18 18
  */
19
-package org.pgpainless.pgpainless.encryption_signing;
19
+package org.pgpainless.encryption_signing;

src/main/java/org/pgpainless/pgpainless/exception/PublicKeyNotFoundException.java → painless-core/src/main/java/org/pgpainless/exception/PublicKeyNotFoundException.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.exception;
16
+package org.pgpainless.exception;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPException;
19 19
 

src/main/java/org/pgpainless/pgpainless/exception/SecretKeyNotFoundException.java → painless-core/src/main/java/org/pgpainless/exception/SecretKeyNotFoundException.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.exception;
16
+package org.pgpainless.exception;
17 17
 
18 18
 public class SecretKeyNotFoundException extends Exception {
19 19
 

src/main/java/org/pgpainless/pgpainless/exception/package-info.java → painless-core/src/main/java/org/pgpainless/exception/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Exceptions.
18 18
  */
19
-package org.pgpainless.pgpainless.exception;
19
+package org.pgpainless.exception;

src/main/java/org/pgpainless/pgpainless/key/OpenPgpV4Fingerprint.java → painless-core/src/main/java/org/pgpainless/key/OpenPgpV4Fingerprint.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key;
16
+package org.pgpainless.key;
17 17
 
18 18
 import java.math.BigInteger;
19 19
 import java.nio.ByteBuffer;

src/main/java/org/pgpainless/pgpainless/key/collection/KeyRingCollection.java → painless-core/src/main/java/org/pgpainless/key/collection/KeyRingCollection.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.collection;
16
+package org.pgpainless.key.collection;
17 17
 
18 18
 import java.io.File;
19 19
 import java.io.FileInputStream;
@@ -27,7 +27,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRing;
27 27
 import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
28 28
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
29 29
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
30
-import org.pgpainless.pgpainless.PGPainless;
30
+import org.pgpainless.PGPainless;
31 31
 
32 32
 public class KeyRingCollection {
33 33
 

src/main/java/org/pgpainless/pgpainless/key/collection/PGPKeyRing.java → painless-core/src/main/java/org/pgpainless/key/collection/PGPKeyRing.java View File

@@ -13,12 +13,12 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.collection;
16
+package org.pgpainless.key.collection;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPPublicKey;
19 19
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
20 20
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
21
-import org.pgpainless.pgpainless.key.OpenPgpV4Fingerprint;
21
+import org.pgpainless.key.OpenPgpV4Fingerprint;
22 22
 
23 23
 public class PGPKeyRing {
24 24
 

src/main/java/org/pgpainless/pgpainless/key/collection/package-info.java → painless-core/src/main/java/org/pgpainless/key/collection/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * OpenPGP key collections.
18 18
  */
19
-package org.pgpainless.pgpainless.key.collection;
19
+package org.pgpainless.key.collection;

src/main/java/org/pgpainless/pgpainless/key/generation/KeyRingBuilder.java → painless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilder.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation;
16
+package org.pgpainless.key.generation;
17 17
 
18 18
 
19 19
 import java.nio.charset.Charset;
@@ -26,7 +26,6 @@ import java.util.ArrayList;
26 26
 import java.util.Date;
27 27
 import java.util.List;
28 28
 
29
-import org.bouncycastle.bcpg.HashAlgorithmTags;
30 29
 import org.bouncycastle.bcpg.sig.KeyFlags;
31 30
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
32 31
 import org.bouncycastle.openpgp.PGPEncryptedData;
@@ -44,17 +43,17 @@ import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
44 43
 import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
45 44
 import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair;
46 45
 import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder;
47
-import org.pgpainless.pgpainless.algorithm.HashAlgorithm;
48
-import org.pgpainless.pgpainless.algorithm.KeyFlag;
49
-import org.pgpainless.pgpainless.key.collection.PGPKeyRing;
50
-import org.pgpainless.pgpainless.key.generation.type.ECDH;
51
-import org.pgpainless.pgpainless.key.generation.type.ECDSA;
52
-import org.pgpainless.pgpainless.key.generation.type.KeyType;
53
-import org.pgpainless.pgpainless.key.generation.type.RSA_GENERAL;
54
-import org.pgpainless.pgpainless.key.generation.type.curve.EllipticCurve;
55
-import org.pgpainless.pgpainless.key.generation.type.length.RsaLength;
56
-import org.pgpainless.pgpainless.util.KeyRingSubKeyFix;
57
-import org.pgpainless.pgpainless.util.Passphrase;
46
+import org.pgpainless.algorithm.HashAlgorithm;
47
+import org.pgpainless.algorithm.KeyFlag;
48
+import org.pgpainless.key.collection.PGPKeyRing;
49
+import org.pgpainless.key.generation.type.ECDH;
50
+import org.pgpainless.key.generation.type.ECDSA;
51
+import org.pgpainless.key.generation.type.KeyType;
52
+import org.pgpainless.key.generation.type.RSA_GENERAL;
53
+import org.pgpainless.key.generation.type.curve.EllipticCurve;
54
+import org.pgpainless.key.generation.type.length.RsaLength;
55
+import org.pgpainless.util.KeyRingSubKeyFix;
56
+import org.pgpainless.util.Passphrase;
58 57
 
59 58
 public class KeyRingBuilder implements KeyRingBuilderInterface {
60 59
 

src/main/java/org/pgpainless/pgpainless/key/generation/KeyRingBuilderInterface.java → painless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilderInterface.java View File

@@ -13,15 +13,15 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation;
16
+package org.pgpainless.key.generation;
17 17
 
18 18
 import java.security.InvalidAlgorithmParameterException;
19 19
 import java.security.NoSuchAlgorithmException;
20 20
 import java.security.NoSuchProviderException;
21 21
 
22 22
 import org.bouncycastle.openpgp.PGPException;
23
-import org.pgpainless.pgpainless.key.collection.PGPKeyRing;
24
-import org.pgpainless.pgpainless.util.Passphrase;
23
+import org.pgpainless.key.collection.PGPKeyRing;
24
+import org.pgpainless.util.Passphrase;
25 25
 
26 26
 public interface KeyRingBuilderInterface {
27 27
 

src/main/java/org/pgpainless/pgpainless/key/generation/KeySpec.java → painless-core/src/main/java/org/pgpainless/key/generation/KeySpec.java View File

@@ -13,11 +13,11 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation;
16
+package org.pgpainless.key.generation;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator;
19 19
 import org.bouncycastle.openpgp.PGPSignatureSubpacketVector;
20
-import org.pgpainless.pgpainless.key.generation.type.KeyType;
20
+import org.pgpainless.key.generation.type.KeyType;
21 21
 
22 22
 public class KeySpec {
23 23
 

src/main/java/org/pgpainless/pgpainless/key/generation/KeySpecBuilder.java → painless-core/src/main/java/org/pgpainless/key/generation/KeySpecBuilder.java View File

@@ -13,17 +13,17 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation;
16
+package org.pgpainless.key.generation;
17 17
 
18 18
 import org.bouncycastle.bcpg.sig.Features;
19 19
 import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator;
20
-import org.pgpainless.pgpainless.algorithm.AlgorithmSuite;
21
-import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm;
22
-import org.pgpainless.pgpainless.algorithm.Feature;
23
-import org.pgpainless.pgpainless.algorithm.HashAlgorithm;
24
-import org.pgpainless.pgpainless.algorithm.KeyFlag;
25
-import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm;
26
-import org.pgpainless.pgpainless.key.generation.type.KeyType;
20
+import org.pgpainless.algorithm.AlgorithmSuite;
21
+import org.pgpainless.algorithm.CompressionAlgorithm;
22
+import org.pgpainless.algorithm.Feature;
23
+import org.pgpainless.algorithm.HashAlgorithm;
24
+import org.pgpainless.algorithm.KeyFlag;
25
+import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
26
+import org.pgpainless.key.generation.type.KeyType;
27 27
 
28 28
 public class KeySpecBuilder implements KeySpecBuilderInterface {
29 29
 

src/main/java/org/pgpainless/pgpainless/key/generation/KeySpecBuilderInterface.java → painless-core/src/main/java/org/pgpainless/key/generation/KeySpecBuilderInterface.java View File

@@ -13,13 +13,13 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation;
16
+package org.pgpainless.key.generation;
17 17
 
18
-import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm;
19
-import org.pgpainless.pgpainless.algorithm.Feature;
20
-import org.pgpainless.pgpainless.algorithm.HashAlgorithm;
21
-import org.pgpainless.pgpainless.algorithm.KeyFlag;
22
-import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm;
18
+import org.pgpainless.algorithm.CompressionAlgorithm;
19
+import org.pgpainless.algorithm.Feature;
20
+import org.pgpainless.algorithm.HashAlgorithm;
21
+import org.pgpainless.algorithm.KeyFlag;
22
+import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
23 23
 
24 24
 public interface KeySpecBuilderInterface {
25 25
 

src/main/java/org/pgpainless/pgpainless/key/generation/package-info.java → painless-core/src/main/java/org/pgpainless/key/generation/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Classes related to OpenPGP key generation.
18 18
  */
19
-package org.pgpainless.pgpainless.key.generation;
19
+package org.pgpainless.key.generation;

src/main/java/org/pgpainless/pgpainless/key/generation/type/ECDH.java → painless-core/src/main/java/org/pgpainless/key/generation/type/ECDH.java View File

@@ -13,13 +13,13 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type;
16
+package org.pgpainless.key.generation.type;
17 17
 
18 18
 import java.security.spec.AlgorithmParameterSpec;
19 19
 
20 20
 import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
21
-import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm;
22
-import org.pgpainless.pgpainless.key.generation.type.curve.EllipticCurve;
21
+import org.pgpainless.algorithm.PublicKeyAlgorithm;
22
+import org.pgpainless.key.generation.type.curve.EllipticCurve;
23 23
 
24 24
 public class ECDH implements KeyType {
25 25
 

src/main/java/org/pgpainless/pgpainless/key/generation/type/ECDSA.java → painless-core/src/main/java/org/pgpainless/key/generation/type/ECDSA.java View File

@@ -13,10 +13,11 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type;
16
+package org.pgpainless.key.generation.type;
17 17
 
18
-import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm;
19
-import org.pgpainless.pgpainless.key.generation.type.curve.EllipticCurve;
18
+
19
+import org.pgpainless.algorithm.PublicKeyAlgorithm;
20
+import org.pgpainless.key.generation.type.curve.EllipticCurve;
20 21
 
21 22
 public class ECDSA extends ECDH {
22 23
 

src/main/java/org/pgpainless/pgpainless/key/generation/type/ElGamal_ENCRYPT.java → painless-core/src/main/java/org/pgpainless/key/generation/type/ElGamal_ENCRYPT.java View File

@@ -13,10 +13,10 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type;
16
+package org.pgpainless.key.generation.type;
17 17
 
18
-import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm;
19
-import org.pgpainless.pgpainless.key.generation.type.length.ElGamalLength;
18
+import org.pgpainless.algorithm.PublicKeyAlgorithm;
19
+import org.pgpainless.key.generation.type.length.ElGamalLength;
20 20
 
21 21
 public class ElGamal_ENCRYPT extends ElGamal_GENERAL {
22 22
 

src/main/java/org/pgpainless/pgpainless/key/generation/type/ElGamal_GENERAL.java → painless-core/src/main/java/org/pgpainless/key/generation/type/ElGamal_GENERAL.java View File

@@ -13,13 +13,13 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type;
16
+package org.pgpainless.key.generation.type;
17 17
 
18 18
 import java.security.spec.AlgorithmParameterSpec;
19 19
 
20 20
 import org.bouncycastle.jce.spec.ElGamalParameterSpec;
21
-import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm;
22
-import org.pgpainless.pgpainless.key.generation.type.length.ElGamalLength;
21
+import org.pgpainless.algorithm.PublicKeyAlgorithm;
22
+import org.pgpainless.key.generation.type.length.ElGamalLength;
23 23
 
24 24
 public class ElGamal_GENERAL implements KeyType {
25 25
 

src/main/java/org/pgpainless/pgpainless/key/generation/type/KeyType.java → painless-core/src/main/java/org/pgpainless/key/generation/type/KeyType.java View File

@@ -13,11 +13,11 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type;
16
+package org.pgpainless.key.generation.type;
17 17
 
18 18
 import java.security.spec.AlgorithmParameterSpec;
19 19
 
20
-import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm;
20
+import org.pgpainless.algorithm.PublicKeyAlgorithm;
21 21
 
22 22
 public interface KeyType {
23 23
 

src/main/java/org/pgpainless/pgpainless/key/generation/type/RSA_ENCRYPT.java → painless-core/src/main/java/org/pgpainless/key/generation/type/RSA_ENCRYPT.java View File

@@ -13,10 +13,10 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type;
16
+package org.pgpainless.key.generation.type;
17 17
 
18
-import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm;
19
-import org.pgpainless.pgpainless.key.generation.type.length.RsaLength;
18
+import org.pgpainless.algorithm.PublicKeyAlgorithm;
19
+import org.pgpainless.key.generation.type.length.RsaLength;
20 20
 
21 21
 public class RSA_ENCRYPT extends RSA_GENERAL {
22 22
 

src/main/java/org/pgpainless/pgpainless/key/generation/type/RSA_GENERAL.java → painless-core/src/main/java/org/pgpainless/key/generation/type/RSA_GENERAL.java View File

@@ -13,13 +13,13 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type;
16
+package org.pgpainless.key.generation.type;
17 17
 
18 18
 import java.security.spec.AlgorithmParameterSpec;
19 19
 import java.security.spec.RSAKeyGenParameterSpec;
20 20
 
21
-import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm;
22
-import org.pgpainless.pgpainless.key.generation.type.length.RsaLength;
21
+import org.pgpainless.algorithm.PublicKeyAlgorithm;
22
+import org.pgpainless.key.generation.type.length.RsaLength;
23 23
 
24 24
 public class RSA_GENERAL implements KeyType {
25 25
 

src/main/java/org/pgpainless/pgpainless/key/generation/type/RSA_SIGN.java → painless-core/src/main/java/org/pgpainless/key/generation/type/RSA_SIGN.java View File

@@ -13,10 +13,10 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type;
16
+package org.pgpainless.key.generation.type;
17 17
 
18
-import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm;
19
-import org.pgpainless.pgpainless.key.generation.type.length.RsaLength;
18
+import org.pgpainless.algorithm.PublicKeyAlgorithm;
19
+import org.pgpainless.key.generation.type.length.RsaLength;
20 20
 
21 21
 public class RSA_SIGN extends RSA_GENERAL {
22 22
 

src/main/java/org/pgpainless/pgpainless/key/generation/type/curve/EllipticCurve.java → painless-core/src/main/java/org/pgpainless/key/generation/type/curve/EllipticCurve.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type.curve;
16
+package org.pgpainless.key.generation.type.curve;
17 17
 
18 18
 public enum EllipticCurve {
19 19
     _P256("P-256"),

src/main/java/org/pgpainless/pgpainless/key/generation/type/curve/package-info.java → painless-core/src/main/java/org/pgpainless/key/generation/type/curve/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Classes related to elliptic curve cryptography.
18 18
  */
19
-package org.pgpainless.pgpainless.key.generation.type.curve;
19
+package org.pgpainless.key.generation.type.curve;

src/main/java/org/pgpainless/pgpainless/key/generation/type/length/DiffieHellmanLength.java → painless-core/src/main/java/org/pgpainless/key/generation/type/length/DiffieHellmanLength.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type.length;
16
+package org.pgpainless.key.generation.type.length;
17 17
 
18 18
 public enum DiffieHellmanLength implements KeyLength {
19 19
 

src/main/java/org/pgpainless/pgpainless/key/generation/type/length/ElGamalLength.java → painless-core/src/main/java/org/pgpainless/key/generation/type/length/ElGamalLength.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type.length;
16
+package org.pgpainless.key.generation.type.length;
17 17
 
18 18
 import java.math.BigInteger;
19 19
 

src/main/java/org/pgpainless/pgpainless/key/generation/type/length/KeyLength.java → painless-core/src/main/java/org/pgpainless/key/generation/type/length/KeyLength.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type.length;
16
+package org.pgpainless.key.generation.type.length;
17 17
 
18 18
 public interface KeyLength {
19 19
 

src/main/java/org/pgpainless/pgpainless/key/generation/type/length/RsaLength.java → painless-core/src/main/java/org/pgpainless/key/generation/type/length/RsaLength.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.generation.type.length;
16
+package org.pgpainless.key.generation.type.length;
17 17
 
18 18
 public enum RsaLength implements KeyLength {
19 19
     @Deprecated

src/main/java/org/pgpainless/pgpainless/key/generation/type/length/package-info.java → painless-core/src/main/java/org/pgpainless/key/generation/type/length/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Classes describing the lengths of different public key crypto systems.
18 18
  */
19
-package org.pgpainless.pgpainless.key.generation.type.length;
19
+package org.pgpainless.key.generation.type.length;

src/main/java/org/pgpainless/pgpainless/key/generation/type/package-info.java → painless-core/src/main/java/org/pgpainless/key/generation/type/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Classes describing different OpenPGP key types.
18 18
  */
19
-package org.pgpainless.pgpainless.key.generation.type;
19
+package org.pgpainless.key.generation.type;

src/main/java/org/pgpainless/pgpainless/key/package-info.java → painless-core/src/main/java/org/pgpainless/key/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Classes related to OpenPGP keys.
18 18
  */
19
-package org.pgpainless.pgpainless.key;
19
+package org.pgpainless.key;

src/main/java/org/pgpainless/pgpainless/key/parsing/KeyRingReader.java → painless-core/src/main/java/org/pgpainless/key/parsing/KeyRingReader.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.parsing;
16
+package org.pgpainless.key.parsing;
17 17
 
18 18
 import java.io.ByteArrayInputStream;
19 19
 import java.io.IOException;
@@ -27,7 +27,7 @@ import org.bouncycastle.openpgp.PGPSecretKeyRing;
27 27
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
28 28
 import org.bouncycastle.openpgp.PGPUtil;
29 29
 import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
30
-import org.pgpainless.pgpainless.key.collection.PGPKeyRing;
30
+import org.pgpainless.key.collection.PGPKeyRing;
31 31
 
32 32
 public class KeyRingReader {
33 33
 

src/main/java/org/pgpainless/pgpainless/key/parsing/package-info.java → painless-core/src/main/java/org/pgpainless/key/parsing/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Classes related to OpenPGP key reading.
18 18
  */
19
-package org.pgpainless.pgpainless.key.parsing;
19
+package org.pgpainless.key.parsing;

src/main/java/org/pgpainless/pgpainless/key/protection/KeyRingProtectionSettings.java → painless-core/src/main/java/org/pgpainless/key/protection/KeyRingProtectionSettings.java View File

@@ -13,10 +13,10 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.protection;
16
+package org.pgpainless.key.protection;
17 17
 
18
-import org.pgpainless.pgpainless.algorithm.HashAlgorithm;
19
-import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm;
18
+import org.pgpainless.algorithm.HashAlgorithm;
19
+import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
20 20
 
21 21
 public class KeyRingProtectionSettings {
22 22
 

src/main/java/org/pgpainless/pgpainless/key/protection/PassphraseMapKeyRingProtector.java → painless-core/src/main/java/org/pgpainless/key/protection/PassphraseMapKeyRingProtector.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.protection;
16
+package org.pgpainless.key.protection;
17 17
 
18 18
 import java.util.HashMap;
19 19
 import java.util.Map;
@@ -25,7 +25,7 @@ import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider;
25 25
 import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder;
26 26
 import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyEncryptorBuilder;
27 27
 import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider;
28
-import org.pgpainless.pgpainless.util.Passphrase;
28
+import org.pgpainless.util.Passphrase;
29 29
 
30 30
 /**
31 31
  * Implementation of the {@link SecretKeyRingProtector} which holds a map of key ids and their passwords.

src/main/java/org/pgpainless/pgpainless/key/protection/SecretKeyRingProtector.java → painless-core/src/main/java/org/pgpainless/key/protection/SecretKeyRingProtector.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.protection;
16
+package org.pgpainless.key.protection;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPException;
19 19
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;

src/main/java/org/pgpainless/pgpainless/key/protection/UnprotectedKeysProtector.java → painless-core/src/main/java/org/pgpainless/key/protection/UnprotectedKeysProtector.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.protection;
16
+package org.pgpainless.key.protection;
17 17
 
18 18
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
19 19
 import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;

src/main/java/org/pgpainless/pgpainless/key/protection/package-info.java → painless-core/src/main/java/org/pgpainless/key/protection/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Classes related to OpenPGP secret key password protection.
18 18
  */
19
-package org.pgpainless.pgpainless.key.protection;
19
+package org.pgpainless.key.protection;

src/main/java/org/pgpainless/pgpainless/key/selection/key/KeySelectionStrategy.java → painless-core/src/main/java/org/pgpainless/key/selection/key/KeySelectionStrategy.java View File

@@ -13,11 +13,11 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.key;
16
+package org.pgpainless.key.selection.key;
17 17
 
18 18
 import java.util.Set;
19 19
 
20
-import org.pgpainless.pgpainless.util.MultiMap;
20
+import org.pgpainless.util.MultiMap;
21 21
 
22 22
 
23 23
 /**

src/main/java/org/pgpainless/pgpainless/key/selection/key/PublicKeySelectionStrategy.java → painless-core/src/main/java/org/pgpainless/key/selection/key/PublicKeySelectionStrategy.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.key;
16
+package org.pgpainless.key.selection.key;
17 17
 
18 18
 import java.util.HashSet;
19 19
 import java.util.Iterator;
@@ -21,7 +21,7 @@ import java.util.Set;
21 21
 
22 22
 import org.bouncycastle.openpgp.PGPPublicKey;
23 23
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
24
-import org.pgpainless.pgpainless.util.MultiMap;
24
+import org.pgpainless.util.MultiMap;
25 25
 
26 26
 /**
27 27
  * Key Selection Strategy which accepts {@link PGPPublicKey}s that are accepted by the abstract method

src/main/java/org/pgpainless/pgpainless/key/selection/key/SecretKeySelectionStrategy.java → painless-core/src/main/java/org/pgpainless/key/selection/key/SecretKeySelectionStrategy.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.key;
16
+package org.pgpainless.key.selection.key;
17 17
 
18 18
 import java.util.HashSet;
19 19
 import java.util.Iterator;
@@ -21,7 +21,7 @@ import java.util.Set;
21 21
 
22 22
 import org.bouncycastle.openpgp.PGPSecretKey;
23 23
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
24
-import org.pgpainless.pgpainless.util.MultiMap;
24
+import org.pgpainless.util.MultiMap;
25 25
 
26 26
 /**
27 27
  * Key Selection Strategy which accepts {@link PGPSecretKey}s that are accepted by the abstract method

src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/And.java → painless-core/src/main/java/org/pgpainless/key/selection/key/impl/And.java View File

@@ -13,12 +13,12 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.key.impl;
16
+package org.pgpainless.key.selection.key.impl;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPPublicKey;
19 19
 import org.bouncycastle.openpgp.PGPSecretKey;
20
-import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy;
21
-import org.pgpainless.pgpainless.key.selection.key.SecretKeySelectionStrategy;
20
+import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
21
+import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
22 22
 
23 23
 public class And {
24 24
 

src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/EncryptionKeySelectionStrategy.java → painless-core/src/main/java/org/pgpainless/key/selection/key/impl/EncryptionKeySelectionStrategy.java View File

@@ -13,10 +13,10 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.key.impl;
16
+package org.pgpainless.key.selection.key.impl;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPPublicKey;
19
-import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy;
19
+import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
20 20
 
21 21
 /**
22 22
  * Key Selection Strategy that only accepts {@link PGPPublicKey}s which are capable of encryption.

src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/NoRevocation.java → painless-core/src/main/java/org/pgpainless/key/selection/key/impl/NoRevocation.java View File

@@ -13,12 +13,12 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.key.impl;
16
+package org.pgpainless.key.selection.key.impl;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPPublicKey;
19 19
 import org.bouncycastle.openpgp.PGPSecretKey;
20
-import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy;
21
-import org.pgpainless.pgpainless.key.selection.key.SecretKeySelectionStrategy;
20
+import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
21
+import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
22 22
 
23 23
 /**
24 24
  * Key Selection Strategies that do accept only keys, which have no revocation.

src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/Or.java → painless-core/src/main/java/org/pgpainless/key/selection/key/impl/Or.java View File

@@ -13,12 +13,12 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.key.impl;
16
+package org.pgpainless.key.selection.key.impl;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPPublicKey;
19 19
 import org.bouncycastle.openpgp.PGPSecretKey;
20
-import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy;
21
-import org.pgpainless.pgpainless.key.selection.key.SecretKeySelectionStrategy;
20
+import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
21
+import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
22 22
 
23 23
 public class Or {
24 24
 

src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/SignatureKeySelectionStrategy.java → painless-core/src/main/java/org/pgpainless/key/selection/key/impl/SignatureKeySelectionStrategy.java View File

@@ -13,10 +13,10 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.key.impl;
16
+package org.pgpainless.key.selection.key.impl;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPSecretKey;
19
-import org.pgpainless.pgpainless.key.selection.key.SecretKeySelectionStrategy;
19
+import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
20 20
 
21 21
 /**
22 22
  * Key Selection Strategy that only accepts {@link PGPSecretKey}s which are capable of signing.

src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/SignedByMasterKey.java → painless-core/src/main/java/org/pgpainless/key/selection/key/impl/SignedByMasterKey.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.key.impl;
16
+package org.pgpainless.key.selection.key.impl;
17 17
 
18 18
 import java.util.Arrays;
19 19
 import java.util.Iterator;
@@ -24,7 +24,7 @@ import org.bouncycastle.openpgp.PGPException;
24 24
 import org.bouncycastle.openpgp.PGPPublicKey;
25 25
 import org.bouncycastle.openpgp.PGPSignature;
26 26
 import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider;
27
-import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy;
27
+import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
28 28
 
29 29
 public class SignedByMasterKey {
30 30
 

src/main/java/org/pgpainless/pgpainless/key/selection/key/impl/package-info.java → painless-core/src/main/java/org/pgpainless/key/selection/key/impl/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Implementations of Key Selection Strategies.
18 18
  */
19
-package org.pgpainless.pgpainless.key.selection.key.impl;
19
+package org.pgpainless.key.selection.key.impl;

src/main/java/org/pgpainless/pgpainless/key/selection/key/package-info.java → painless-core/src/main/java/org/pgpainless/key/selection/key/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Different Key Selection Strategies.
18 18
  */
19
-package org.pgpainless.pgpainless.key.selection.key;
19
+package org.pgpainless.key.selection.key;

src/main/java/org/pgpainless/pgpainless/key/selection/keyring/KeyRingSelectionStrategy.java → painless-core/src/main/java/org/pgpainless/key/selection/keyring/KeyRingSelectionStrategy.java View File

@@ -13,11 +13,11 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.keyring;
16
+package org.pgpainless.key.selection.keyring;
17 17
 
18 18
 import java.util.Set;
19 19
 
20
-import org.pgpainless.pgpainless.util.MultiMap;
20
+import org.pgpainless.util.MultiMap;
21 21
 
22 22
 public interface KeyRingSelectionStrategy<R, C, O> {
23 23
 

src/main/java/org/pgpainless/pgpainless/key/selection/keyring/PublicKeyRingSelectionStrategy.java → painless-core/src/main/java/org/pgpainless/key/selection/keyring/PublicKeyRingSelectionStrategy.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.keyring;
16
+package org.pgpainless.key.selection.keyring;
17 17
 
18 18
 import java.util.HashSet;
19 19
 import java.util.Iterator;
@@ -21,7 +21,7 @@ import java.util.Set;
21 21
 
22 22
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
23 23
 import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
24
-import org.pgpainless.pgpainless.util.MultiMap;
24
+import org.pgpainless.util.MultiMap;
25 25
 
26 26
 public abstract class PublicKeyRingSelectionStrategy<O> implements KeyRingSelectionStrategy<PGPPublicKeyRing, PGPPublicKeyRingCollection, O> {
27 27
 

src/main/java/org/pgpainless/pgpainless/key/selection/keyring/SecretKeyRingSelectionStrategy.java → painless-core/src/main/java/org/pgpainless/key/selection/keyring/SecretKeyRingSelectionStrategy.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.keyring;
16
+package org.pgpainless.key.selection.keyring;
17 17
 
18 18
 import java.util.HashSet;
19 19
 import java.util.Iterator;
@@ -21,7 +21,7 @@ import java.util.Set;
21 21
 
22 22
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
23 23
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
24
-import org.pgpainless.pgpainless.util.MultiMap;
24
+import org.pgpainless.util.MultiMap;
25 25
 
26 26
 public abstract class SecretKeyRingSelectionStrategy<O> implements KeyRingSelectionStrategy<PGPSecretKeyRing, PGPSecretKeyRingCollection, O> {
27 27
     @Override

src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/Email.java → painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/Email.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.keyring.impl;
16
+package org.pgpainless.key.selection.keyring.impl;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPPublicKey;
19 19
 import org.bouncycastle.openpgp.PGPSecretKey;

src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/ExactUserId.java → painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/ExactUserId.java View File

@@ -13,14 +13,15 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.keyring.impl;
16
+package org.pgpainless.key.selection.keyring.impl;
17 17
 
18 18
 import java.util.Iterator;
19 19
 
20 20
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
21 21
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
22
-import org.pgpainless.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
23
-import org.pgpainless.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
22
+import org.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
23
+import org.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
24
+import org.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
24 25
 
25 26
 public class ExactUserId {
26 27
 

src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/PartialUserId.java → painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/PartialUserId.java View File

@@ -13,14 +13,14 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.keyring.impl;
16
+package org.pgpainless.key.selection.keyring.impl;
17 17
 
18 18
 import java.util.Iterator;
19 19
 
20 20
 import org.bouncycastle.openpgp.PGPPublicKey;
21 21
 import org.bouncycastle.openpgp.PGPSecretKey;
22
-import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy;
23
-import org.pgpainless.pgpainless.key.selection.key.SecretKeySelectionStrategy;
22
+import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
23
+import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
24 24
 
25 25
 public class PartialUserId {
26 26
 

src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/Whitelist.java → painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/Whitelist.java View File

@@ -13,16 +13,16 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.keyring.impl;
16
+package org.pgpainless.key.selection.keyring.impl;
17 17
 
18 18
 import java.util.Map;
19 19
 import java.util.Set;
20 20
 
21 21
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
22 22
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
23
-import org.pgpainless.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
24
-import org.pgpainless.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
25
-import org.pgpainless.pgpainless.util.MultiMap;
23
+import org.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
24
+import org.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
25
+import org.pgpainless.util.MultiMap;
26 26
 
27 27
 public class Whitelist {
28 28
 

src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/Wildcard.java → painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/Wildcard.java View File

@@ -13,12 +13,12 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.keyring.impl;
16
+package org.pgpainless.key.selection.keyring.impl;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
19 19
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
20
-import org.pgpainless.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
21
-import org.pgpainless.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
20
+import org.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
21
+import org.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
22 22
 
23 23
 public class Wildcard {
24 24
 

src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/XMPP.java → painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/XMPP.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.key.selection.keyring.impl;
16
+package org.pgpainless.key.selection.keyring.impl;
17 17
 
18 18
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
19 19
 import org.bouncycastle.openpgp.PGPSecretKeyRing;

src/main/java/org/pgpainless/pgpainless/key/selection/keyring/impl/package-info.java → painless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Implementations of Key Ring Selection Strategies.
18 18
  */
19
-package org.pgpainless.pgpainless.key.selection.keyring.impl;
19
+package org.pgpainless.key.selection.keyring.impl;

src/main/java/org/pgpainless/pgpainless/key/selection/keyring/package-info.java → painless-core/src/main/java/org/pgpainless/key/selection/keyring/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Different Key Ring Selection Strategies.
18 18
  */
19
-package org.pgpainless.pgpainless.key.selection.keyring;
19
+package org.pgpainless.key.selection.keyring;

src/main/java/org/pgpainless/pgpainless/package-info.java → painless-core/src/main/java/org/pgpainless/package-info.java View File

@@ -16,6 +16,6 @@
16 16
 /**
17 17
  * PGPainless - Use OpenPGP Painlessly!
18 18
  *
19
- * @see <a href="http://pgpainless.org">pgpainless.org</a>
19
+ * @see <a href="http://pgpainless.org">org.pgpainless.core.org</a>
20 20
  */
21
-package org.pgpainless.pgpainless;
21
+package org.pgpainless;

src/main/java/org/pgpainless/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java → painless-core/src/main/java/org/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.symmetric_encryption;
16
+package org.pgpainless.symmetric_encryption;
17 17
 
18 18
 import java.io.BufferedInputStream;
19 19
 import java.io.ByteArrayInputStream;
@@ -39,9 +39,9 @@ import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider;
39 39
 import org.bouncycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator;
40 40
 import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder;
41 41
 import org.bouncycastle.util.io.Streams;
42
-import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm;
43
-import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm;
44
-import org.pgpainless.pgpainless.util.Passphrase;
42
+import org.pgpainless.algorithm.CompressionAlgorithm;
43
+import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
44
+import org.pgpainless.util.Passphrase;
45 45
 
46 46
 /**
47 47
  * Stolen from <a href="https://github.com/bcgit/bc-java/blob/master/pg/src/main/java/org/bouncycastle/openpgp/examples/PBEFileProcessor.java">

src/main/java/org/pgpainless/pgpainless/symmetric_encryption/package-info.java → painless-core/src/main/java/org/pgpainless/symmetric_encryption/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Classes related to OpenPGP symmetric encryption.
18 18
  */
19
-package org.pgpainless.pgpainless.symmetric_encryption;
19
+package org.pgpainless.symmetric_encryption;

src/main/java/org/pgpainless/pgpainless/util/BCUtil.java → painless-core/src/main/java/org/pgpainless/util/BCUtil.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.util;
16
+package org.pgpainless.util;
17 17
 
18 18
 import java.io.ByteArrayInputStream;
19 19
 import java.io.ByteArrayOutputStream;
@@ -39,11 +39,11 @@ import org.bouncycastle.openpgp.PGPSignatureSubpacketVector;
39 39
 import org.bouncycastle.openpgp.PGPUtil;
40 40
 import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
41 41
 import org.bouncycastle.util.io.Streams;
42
-import org.pgpainless.pgpainless.algorithm.KeyFlag;
43
-import org.pgpainless.pgpainless.key.selection.key.PublicKeySelectionStrategy;
44
-import org.pgpainless.pgpainless.key.selection.key.impl.And;
45
-import org.pgpainless.pgpainless.key.selection.key.impl.NoRevocation;
46
-import org.pgpainless.pgpainless.key.selection.key.impl.SignedByMasterKey;
42
+import org.pgpainless.algorithm.KeyFlag;
43
+import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
44
+import org.pgpainless.key.selection.key.impl.And;
45
+import org.pgpainless.key.selection.key.impl.NoRevocation;
46
+import org.pgpainless.key.selection.key.impl.SignedByMasterKey;
47 47
 
48 48
 public class BCUtil {
49 49
 

src/main/java/org/pgpainless/pgpainless/util/KeyRingSubKeyFix.java → painless-core/src/main/java/org/pgpainless/util/KeyRingSubKeyFix.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.util;
16
+package org.pgpainless.util;
17 17
 
18 18
 import java.lang.reflect.Field;
19 19
 import java.util.ArrayList;

src/main/java/org/pgpainless/pgpainless/util/MultiMap.java → painless-core/src/main/java/org/pgpainless/util/MultiMap.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.util;
16
+package org.pgpainless.util;
17 17
 
18 18
 import java.util.Collection;
19 19
 import java.util.HashMap;

src/main/java/org/pgpainless/pgpainless/util/Passphrase.java → painless-core/src/main/java/org/pgpainless/util/Passphrase.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless.util;
16
+package org.pgpainless.util;
17 17
 
18 18
 import java.util.Arrays;
19 19
 

src/main/java/org/pgpainless/pgpainless/util/package-info.java → painless-core/src/main/java/org/pgpainless/util/package-info.java View File

@@ -16,4 +16,4 @@
16 16
 /**
17 17
  * Utility classes.
18 18
  */
19
-package org.pgpainless.pgpainless.util;
19
+package org.pgpainless.util;

src/test/java/org/pgpainless/pgpainless/AbstractPGPainlessTest.java → painless-core/src/test/java/org/pgpainless/AbstractPGPainlessTest.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless;
16
+package org.pgpainless;
17 17
 
18 18
 import java.security.Security;
19 19
 

src/test/java/org/pgpainless/pgpainless/BCUtilTest.java → painless-core/src/test/java/org/pgpainless/BCUtilTest.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless;
16
+package org.pgpainless;
17 17
 
18 18
 import static junit.framework.TestCase.assertEquals;
19 19
 import static junit.framework.TestCase.assertNotNull;
@@ -29,6 +29,7 @@ import java.util.Iterator;
29 29
 import java.util.logging.Level;
30 30
 import java.util.logging.Logger;
31 31
 
32
+import junit.framework.TestCase;
32 33
 import org.bouncycastle.openpgp.PGPException;
33 34
 import org.bouncycastle.openpgp.PGPPublicKey;
34 35
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
@@ -37,11 +38,11 @@ import org.bouncycastle.openpgp.PGPSecretKey;
37 38
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
38 39
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
39 40
 import org.junit.Test;
40
-import org.pgpainless.pgpainless.key.collection.PGPKeyRing;
41
-import org.pgpainless.pgpainless.key.generation.KeySpec;
42
-import org.pgpainless.pgpainless.key.generation.type.RSA_GENERAL;
43
-import org.pgpainless.pgpainless.key.generation.type.length.RsaLength;
44
-import org.pgpainless.pgpainless.util.BCUtil;
41
+import org.pgpainless.key.collection.PGPKeyRing;
42
+import org.pgpainless.key.generation.KeySpec;
43
+import org.pgpainless.key.generation.type.RSA_GENERAL;
44
+import org.pgpainless.key.generation.type.length.RsaLength;
45
+import org.pgpainless.util.BCUtil;
45 46
 
46 47
 public class BCUtilTest extends AbstractPGPainlessTest {
47 48
 
@@ -120,15 +121,15 @@ public class BCUtilTest extends AbstractPGPainlessTest {
120 121
             }
121 122
         }
122 123
 
123
-        assertNotNull(subKey);
124
+        TestCase.assertNotNull(subKey);
124 125
 
125 126
         PGPSecretKeyRing alice_mallory = PGPSecretKeyRing.insertSecretKey(alice.getSecretKeys(), subKey);
126 127
 
127 128
         // Check, if alice_mallory contains mallory's key
128
-        assertNotNull(alice_mallory.getSecretKey(subKey.getKeyID()));
129
+        TestCase.assertNotNull(alice_mallory.getSecretKey(subKey.getKeyID()));
129 130
 
130 131
         PGPSecretKeyRing cleaned = BCUtil.removeUnassociatedKeysFromKeyRing(alice_mallory, alice.getPublicKeys().getPublicKey());
131
-        assertNull(cleaned.getSecretKey(subKey.getKeyID()));
132
+        TestCase.assertNull(cleaned.getSecretKey(subKey.getKeyID()));
132 133
     }
133 134
 
134 135
     @Test

src/test/java/org/pgpainless/pgpainless/BouncycastleExportSubkeys.java → painless-core/src/test/java/org/pgpainless/BouncycastleExportSubkeys.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless;
16
+package org.pgpainless;
17 17
 
18 18
 import java.io.IOException;
19 19
 import java.security.InvalidAlgorithmParameterException;

src/test/java/org/pgpainless/pgpainless/EncryptDecryptTest.java → painless-core/src/test/java/org/pgpainless/EncryptDecryptTest.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless;
16
+package org.pgpainless;
17 17
 
18 18
 import static junit.framework.TestCase.assertEquals;
19 19
 import static junit.framework.TestCase.assertFalse;
@@ -36,21 +36,21 @@ import org.bouncycastle.openpgp.PGPSecretKeyRing;
36 36
 import org.bouncycastle.util.io.Streams;
37 37
 import org.junit.Ignore;
38 38
 import org.junit.Test;
39
-import org.pgpainless.pgpainless.algorithm.KeyFlag;
40
-import org.pgpainless.pgpainless.algorithm.PublicKeyAlgorithm;
41
-import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm;
42
-import org.pgpainless.pgpainless.decryption_verification.DecryptionStream;
43
-import org.pgpainless.pgpainless.decryption_verification.PainlessResult;
44
-import org.pgpainless.pgpainless.encryption_signing.EncryptionStream;
45
-import org.pgpainless.pgpainless.key.collection.PGPKeyRing;
46
-import org.pgpainless.pgpainless.key.generation.KeySpec;
47
-import org.pgpainless.pgpainless.key.generation.type.ElGamal_GENERAL;
48
-import org.pgpainless.pgpainless.key.generation.type.RSA_GENERAL;
49
-import org.pgpainless.pgpainless.key.generation.type.length.ElGamalLength;
50
-import org.pgpainless.pgpainless.key.generation.type.length.RsaLength;
51
-import org.pgpainless.pgpainless.key.protection.SecretKeyRingProtector;
52
-import org.pgpainless.pgpainless.key.protection.UnprotectedKeysProtector;
53
-import org.pgpainless.pgpainless.util.BCUtil;
39
+import org.pgpainless.algorithm.KeyFlag;
40
+import org.pgpainless.algorithm.PublicKeyAlgorithm;
41
+import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
42
+import org.pgpainless.decryption_verification.DecryptionStream;
43
+import org.pgpainless.decryption_verification.PainlessResult;
44
+import org.pgpainless.encryption_signing.EncryptionStream;
45
+import org.pgpainless.key.collection.PGPKeyRing;
46
+import org.pgpainless.key.generation.KeySpec;
47
+import org.pgpainless.key.generation.type.ElGamal_GENERAL;
48
+import org.pgpainless.key.generation.type.RSA_GENERAL;
49
+import org.pgpainless.key.generation.type.length.ElGamalLength;
50
+import org.pgpainless.key.generation.type.length.RsaLength;
51
+import org.pgpainless.key.protection.SecretKeyRingProtector;
52
+import org.pgpainless.key.protection.UnprotectedKeysProtector;
53
+import org.pgpainless.util.BCUtil;
54 54
 
55 55
 public class EncryptDecryptTest extends AbstractPGPainlessTest {
56 56
 

src/test/java/org/pgpainless/pgpainless/ImportExportKeyTest.java → painless-core/src/test/java/org/pgpainless/ImportExportKeyTest.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless;
16
+package org.pgpainless;
17 17
 
18 18
 import static junit.framework.TestCase.assertTrue;
19 19
 
@@ -32,7 +32,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRing;
32 32
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
33 33
 import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
34 34
 import org.junit.Test;
35
-import org.pgpainless.pgpainless.key.collection.PGPKeyRing;
35
+import org.pgpainless.key.collection.PGPKeyRing;
36 36
 
37 37
 public class ImportExportKeyTest {
38 38
 

src/test/java/org/pgpainless/pgpainless/KeyRingSubKeyFixTest.java → painless-core/src/test/java/org/pgpainless/KeyRingSubKeyFixTest.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless;
16
+package org.pgpainless;
17 17
 
18 18
 import static junit.framework.TestCase.assertTrue;
19 19
 
@@ -29,9 +29,9 @@ import org.bouncycastle.openpgp.PGPException;
29 29
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
30 30
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
31 31
 import org.junit.Test;
32
-import org.pgpainless.pgpainless.key.collection.PGPKeyRing;
33
-import org.pgpainless.pgpainless.util.BCUtil;
34
-import org.pgpainless.pgpainless.util.KeyRingSubKeyFix;
32
+import org.pgpainless.key.collection.PGPKeyRing;
33
+import org.pgpainless.util.BCUtil;
34
+import org.pgpainless.util.KeyRingSubKeyFix;
35 35
 
36 36
 public class KeyRingSubKeyFixTest {
37 37
 

src/test/java/org/pgpainless/pgpainless/LengthTest.java → painless-core/src/test/java/org/pgpainless/LengthTest.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless;
16
+package org.pgpainless;
17 17
 
18 18
 import java.io.ByteArrayInputStream;
19 19
 import java.io.ByteArrayOutputStream;
@@ -31,10 +31,10 @@ import org.bouncycastle.openpgp.PGPPublicKeyRing;
31 31
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
32 32
 import org.bouncycastle.util.io.Streams;
33 33
 import org.junit.Ignore;
34
-import org.pgpainless.pgpainless.key.collection.PGPKeyRing;
35
-import org.pgpainless.pgpainless.key.generation.type.length.RsaLength;
36
-import org.pgpainless.pgpainless.key.protection.SecretKeyRingProtector;
37
-import org.pgpainless.pgpainless.key.protection.UnprotectedKeysProtector;
34
+import org.pgpainless.key.collection.PGPKeyRing;
35
+import org.pgpainless.key.generation.type.length.RsaLength;
36
+import org.pgpainless.key.protection.SecretKeyRingProtector;
37
+import org.pgpainless.key.protection.UnprotectedKeysProtector;
38 38
 
39 39
 /**
40 40
  * Class used to determine the length of cipher-text depending on used algorithms.

src/test/java/org/pgpainless/pgpainless/OpenPgpV4FingerprintTest.java → painless-core/src/test/java/org/pgpainless/OpenPgpV4FingerprintTest.java View File

@@ -13,7 +13,7 @@
13 13
  * See the License for the specific language governing permissions and
14 14
  * limitations under the License.
15 15
  */
16
-package org.pgpainless.pgpainless;
16
+package org.pgpainless;
17 17
 
18 18
 import static junit.framework.TestCase.assertEquals;
19 19
 
@@ -21,7 +21,7 @@ import java.io.IOException;
21 21
 
22 22
 import org.bouncycastle.openpgp.PGPPublicKey;
23 23
 import org.junit.Test;
24
-import org.pgpainless.pgpainless.key.OpenPgpV4Fingerprint;
24
+import org.pgpainless.key.OpenPgpV4Fingerprint;
25 25
 
26 26
 public class OpenPgpV4FingerprintTest {
27 27
 

src/test/java/org/pgpainless/pgpainless/SymmetricTest.java → painless-core/src/test/java/org/pgpainless/SymmetricTest.java View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save