You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/06/16 18:36:49 UTC
[sling-org-apache-sling-commons-crypto] 02/03: SLING-10495 Extend
API by salt and secret key providers
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-crypto.git
commit d446562143ad5c96610565eec8bcfaabe3652b89
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Jun 16 11:19:45 2021 +0200
SLING-10495 Extend API by salt and secret key providers
---
.../commons/crypto/{package-info.java => SaltProvider.java} | 11 +++++++++--
.../crypto/{package-info.java => SecretKeyProvider.java} | 13 +++++++++++--
.../java/org/apache/sling/commons/crypto/package-info.java | 2 +-
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/crypto/package-info.java b/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java
similarity index 82%
copy from src/main/java/org/apache/sling/commons/crypto/package-info.java
copy to src/main/java/org/apache/sling/commons/crypto/SaltProvider.java
index 1727374..5b63b8e 100644
--- a/src/main/java/org/apache/sling/commons/crypto/package-info.java
+++ b/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java
@@ -16,7 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("1.0.1")
package org.apache.sling.commons.crypto;
-import org.osgi.annotation.versioning.Version;
+import org.jetbrains.annotations.NotNull;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
+public interface SaltProvider {
+
+ byte @NotNull [] getSalt();
+
+}
diff --git a/src/main/java/org/apache/sling/commons/crypto/package-info.java b/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java
similarity index 79%
copy from src/main/java/org/apache/sling/commons/crypto/package-info.java
copy to src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java
index 1727374..e8f6a02 100644
--- a/src/main/java/org/apache/sling/commons/crypto/package-info.java
+++ b/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java
@@ -16,7 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("1.0.1")
package org.apache.sling.commons.crypto;
-import org.osgi.annotation.versioning.Version;
+import javax.crypto.SecretKey;
+
+import org.jetbrains.annotations.NotNull;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
+public interface SecretKeyProvider {
+
+ @NotNull SecretKey getSecretKey();
+
+}
diff --git a/src/main/java/org/apache/sling/commons/crypto/package-info.java b/src/main/java/org/apache/sling/commons/crypto/package-info.java
index 1727374..82d2999 100644
--- a/src/main/java/org/apache/sling/commons/crypto/package-info.java
+++ b/src/main/java/org/apache/sling/commons/crypto/package-info.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("1.0.1")
+@Version("1.1.0")
package org.apache.sling.commons.crypto;
import org.osgi.annotation.versioning.Version;