2006-02-07 Raif S. Naffah <raif@swiftdsl.com.au>

	* gnu/java/security/provider/GnuDSAPublicKey.java (getEncoded): Use
	Registry constant.
	* gnu/java/security/provider/GnuDSAPrivateKey.java (getEncoded):
	Likewise.
	* gnu/java/security/provider/GnuRSAPrivateKey.java (getEncoded):
	Likewise.
	* gnu/java/security/provider/GnuRSAPublicKey.java (getEncoded):
	Likewise.
	* gnu/java/security/provider/EncodedKeyFactory.java
	(ID_DSA): Redefined in terms of Registry constant.
	(ID_DSA): Redefined in terms of Registry constant.
	(ID_DH): Redefined in terms of Registry constant.
	* gnu/java/security/Registry.java (X509_ENCODING): New constant.
	(PKCS8_ENCODING): Likewise.
	(ASN1_ENCODING): Likewise.
	(RAW_ENCODING_SHORT_NAME): Likewise.
	(X509_ENCODING_SORT_NAME): Likewise.
	(PKCS8_ENCODING_SHORT_NAME): Likewise.
	(ASN1_ENCODING_SHORT_NAME): Likewise.
	(X509_ENCODING_ID): Likewise.
	(PKCS8_ENCODING_ID): Likewise.
	(ASN1_ENCODING_ID): Likewise.
	(DSA_OID_STRING): Likewise.
	(RSA_OID_STRING): Likewise.
	(DH_OID_STRING): Likewise.

5 files changed, 12 insertions, 7 deletions

diff --git a/gnu/java/security/provider/EncodedKeyFactory.java b/gnu/java/security/provider/EncodedKeyFactory.java
index 2bf0fff80..4092df817 100644
--- a/gnu/java/security/provider/EncodedKeyFactory.java
+++ b/gnu/java/security/provider/EncodedKeyFactory.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package gnu.java.security.provider;
 
 import gnu.java.security.OID;
+import gnu.java.security.Registry;
 import gnu.java.security.der.BitString;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
@@ -75,9 +76,9 @@ public class EncodedKeyFactory extends KeyFactorySpi
   // Constants.
   // ------------------------------------------------------------------------
 
-  private static final OID ID_DSA = new OID("1.2.840.10040.4.1");
-  private static final OID ID_RSA = new OID("1.2.840.113549.1.1.1");
-  private static final OID ID_DH  = new OID("1.2.840.10046.2.1");
+  private static final OID ID_DSA = new OID(Registry.DSA_OID_STRING);
+  private static final OID ID_RSA = new OID(Registry.RSA_OID_STRING);
+  private static final OID ID_DH  = new OID(Registry.DH_OID_STRING);
 
   // Instance methods.
   // ------------------------------------------------------------------------
diff --git a/gnu/java/security/provider/GnuDSAPrivateKey.java b/gnu/java/security/provider/GnuDSAPrivateKey.java
index aac2faab2..e79e8d6b6 100644
--- a/gnu/java/security/provider/GnuDSAPrivateKey.java
+++ b/gnu/java/security/provider/GnuDSAPrivateKey.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package gnu.java.security.provider;
 
 import gnu.java.security.OID;
+import gnu.java.security.Registry;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERValue;
 import gnu.java.security.der.DERWriter;
@@ -110,7 +111,7 @@ public class GnuDSAPrivateKey implements DSAPrivateKey
         pki.add(new DERValue(DER.INTEGER, BigInteger.ZERO));
         ArrayList algId = new ArrayList(2);
         algId.add(new DERValue(DER.OBJECT_IDENTIFIER,
-                  new OID("1.2.840.10040.4.1")));
+                               new OID(Registry.DSA_OID_STRING)));
         ArrayList algParams = new ArrayList(3);
         algParams.add(new DERValue(DER.INTEGER, p));
         algParams.add(new DERValue(DER.INTEGER, q));
diff --git a/gnu/java/security/provider/GnuDSAPublicKey.java b/gnu/java/security/provider/GnuDSAPublicKey.java
index 41195fa99..73b9da1e0 100644
--- a/gnu/java/security/provider/GnuDSAPublicKey.java
+++ b/gnu/java/security/provider/GnuDSAPublicKey.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package gnu.java.security.provider;
 
 import gnu.java.security.OID;
+import gnu.java.security.Registry;
 import gnu.java.security.der.BitString;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERValue;
@@ -97,7 +98,7 @@ public class GnuDSAPublicKey implements DSAPublicKey
         ArrayList spki = new ArrayList(2);
         ArrayList alg = new ArrayList(2);
         alg.add(new DERValue(DER.OBJECT_IDENTIFIER,
-                new OID("1.2.840.113549.1.1.1")));
+                             new OID(Registry.DSA_OID_STRING)));
         ArrayList params = new ArrayList(3);
         params.add(new DERValue(DER.INTEGER, p));
         params.add(new DERValue(DER.INTEGER, q));
diff --git a/gnu/java/security/provider/GnuRSAPrivateKey.java b/gnu/java/security/provider/GnuRSAPrivateKey.java
index b09fc88bc..cda9f8eac 100644
--- a/gnu/java/security/provider/GnuRSAPrivateKey.java
+++ b/gnu/java/security/provider/GnuRSAPrivateKey.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package gnu.java.security.provider;
 
 import gnu.java.security.OID;
+import gnu.java.security.Registry;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERValue;
 
@@ -154,7 +155,7 @@ class GnuRSAPrivateKey implements RSAPrivateCrtKey
     pki.add(new DERValue(DER.INTEGER, BigInteger.ZERO));
     ArrayList alg = new ArrayList(2);
     alg.add(new DERValue(DER.OBJECT_IDENTIFIER,
-                         new OID("1.2.840.113549.1.1.1")));
+                         new OID(Registry.RSA_OID_STRING)));
     alg.add(new DERValue(DER.NULL, null));
     pki.add(new DERValue(DER.CONSTRUCTED|DER.SEQUENCE, alg));
     pki.add(new DERValue(DER.OCTET_STRING, pk.getEncoded()));
diff --git a/gnu/java/security/provider/GnuRSAPublicKey.java b/gnu/java/security/provider/GnuRSAPublicKey.java
index a35e761c0..3bdb6629b 100644
--- a/gnu/java/security/provider/GnuRSAPublicKey.java
+++ b/gnu/java/security/provider/GnuRSAPublicKey.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package gnu.java.security.provider;
 
 import gnu.java.security.OID;
+import gnu.java.security.Registry;
 import gnu.java.security.der.BitString;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERValue;
@@ -98,7 +99,7 @@ class GnuRSAPublicKey implements RSAPublicKey
     DERValue rsapk = new DERValue(DER.SEQUENCE|DER.CONSTRUCTED, key);
     ArrayList alg = new ArrayList(2);
     alg.add(new DERValue(DER.OBJECT_IDENTIFIER,
-                         new OID("1.2.840.113549.1.1.1")));
+                         new OID(Registry.RSA_OID_STRING)));
     alg.add(new DERValue(DER.NULL, null));
     ArrayList spki = new ArrayList(2);
     spki.add(new DERValue(DER.SEQUENCE|DER.CONSTRUCTED, alg));