From 987f479a89b8ccc2d39bb6e99fde683e5f82c517 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Wed, 5 Sep 2018 11:19:17 +0200 Subject: Deprecate crypto utilities in com.yahoo.vespa.athenz.tls --- vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Extension.java | 2 ++ vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyAlgorithm.java | 2 ++ .../src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreBuilder.java | 2 ++ vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreType.java | 2 ++ .../src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreUtils.java | 2 ++ vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyUtils.java | 2 ++ vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10Csr.java | 2 ++ .../src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrBuilder.java | 2 ++ .../src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrUtils.java | 2 ++ .../src/main/java/com/yahoo/vespa/athenz/tls/SignatureAlgorithm.java | 2 ++ .../src/main/java/com/yahoo/vespa/athenz/tls/SslContextBuilder.java | 2 ++ .../main/java/com/yahoo/vespa/athenz/tls/SubjectAlternativeName.java | 2 ++ .../main/java/com/yahoo/vespa/athenz/tls/X509CertificateBuilder.java | 2 ++ .../src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateUtils.java | 2 ++ 14 files changed, 28 insertions(+) (limited to 'vespa-athenz/src') diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Extension.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Extension.java index 18403669c4d..9a6c20018b8 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Extension.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Extension.java @@ -5,7 +5,9 @@ import org.bouncycastle.asn1.ASN1ObjectIdentifier; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public enum Extension { BASIC_CONSTRAINS(org.bouncycastle.asn1.x509.Extension.basicConstraints), SUBJECT_ALTERNATIVE_NAMES(org.bouncycastle.asn1.x509.Extension.subjectAlternativeName); diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyAlgorithm.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyAlgorithm.java index 4c4198adaac..d685f85b206 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyAlgorithm.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyAlgorithm.java @@ -3,7 +3,9 @@ package com.yahoo.vespa.athenz.tls; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public enum KeyAlgorithm { RSA("RSA"); diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreBuilder.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreBuilder.java index a9279f45129..3e63e441396 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreBuilder.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreBuilder.java @@ -19,7 +19,9 @@ import static java.util.Collections.singletonList; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public class KeyStoreBuilder { private final List keyEntries = new ArrayList<>(); diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreType.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreType.java index 6c08a60ff5b..b0bfe170789 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreType.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreType.java @@ -9,7 +9,9 @@ import java.security.KeyStoreException; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public enum KeyStoreType { JKS { KeyStore createKeystore() throws KeyStoreException { diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreUtils.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreUtils.java index 12aaa40cce4..96fe76a1f73 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreUtils.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyStoreUtils.java @@ -12,7 +12,9 @@ import java.security.KeyStore; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public class KeyStoreUtils { private KeyStoreUtils() {} diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyUtils.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyUtils.java index c2be1a40893..fc4734d16ca 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyUtils.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/KeyUtils.java @@ -25,7 +25,9 @@ import java.security.spec.PKCS8EncodedKeySpec; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public class KeyUtils { private KeyUtils() {} diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10Csr.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10Csr.java index e0029681b23..8138be9d7d8 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10Csr.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10Csr.java @@ -19,7 +19,9 @@ import static java.util.stream.Collectors.toList; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public class Pkcs10Csr { private final PKCS10CertificationRequest csr; diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrBuilder.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrBuilder.java index 2135f569aeb..702b2f6cd4b 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrBuilder.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrBuilder.java @@ -24,7 +24,9 @@ import static com.yahoo.vespa.athenz.tls.SubjectAlternativeName.Type.DNS_NAME; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public class Pkcs10CsrBuilder { private final X500Principal subject; diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrUtils.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrUtils.java index 2289c9ac0ee..be7bb3690bd 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrUtils.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrUtils.java @@ -13,7 +13,9 @@ import java.io.UncheckedIOException; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public class Pkcs10CsrUtils { private Pkcs10CsrUtils() {} diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SignatureAlgorithm.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SignatureAlgorithm.java index 2f3e2721751..1ff8ebbe78a 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SignatureAlgorithm.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SignatureAlgorithm.java @@ -3,7 +3,9 @@ package com.yahoo.vespa.athenz.tls; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public enum SignatureAlgorithm { SHA256_WITH_RSA("SHA256withRSA"), SHA512_WITH_RSA("SHA512withRSA"); diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SslContextBuilder.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SslContextBuilder.java index ba5785043da..63262eac048 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SslContextBuilder.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SslContextBuilder.java @@ -18,7 +18,9 @@ import java.security.cert.X509Certificate; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public class SslContextBuilder { private KeyStoreSupplier trustStoreSupplier; diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SubjectAlternativeName.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SubjectAlternativeName.java index 8b89fc6fe7f..f5b0c7aa1c6 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SubjectAlternativeName.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SubjectAlternativeName.java @@ -15,7 +15,9 @@ import static java.util.stream.Collectors.toList; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public class SubjectAlternativeName { private final Type type; diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateBuilder.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateBuilder.java index c27b704f6a3..de593f25f61 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateBuilder.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateBuilder.java @@ -31,7 +31,9 @@ import static com.yahoo.vespa.athenz.tls.SubjectAlternativeName.Type.DNS_NAME; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public class X509CertificateBuilder { private final long serialNumber; diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateUtils.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateUtils.java index d96ed17765c..8fc25ab06a4 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateUtils.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateUtils.java @@ -30,7 +30,9 @@ import static java.util.stream.Collectors.toList; /** * @author bjorncs + * @deprecated Use com.yahoo.security.* */ +@Deprecated public class X509CertificateUtils { private X509CertificateUtils() {} -- cgit v1.2.3