diff options
| author | David Hook <dgh@cryptoworkshop.com> | 2013-10-28 08:54:29 +0400 |
|---|---|---|
| committer | David Hook <dgh@cryptoworkshop.com> | 2013-10-28 08:54:29 +0400 |
| commit | 202d7bb86724efb9b4fbb9d5919d5f0a82a3e705 (patch) | |
| tree | ac32c46493d56fd71be57ad9e29056566ed9ff96 /pkix/src/main | |
| parent | 11b80b5952c20368fe9edec906fa473ac755e3e9 (diff) | |
minor clean up.
added the RC4 OID to the helper's dictionary.
Diffstat (limited to 'pkix/src/main')
| -rw-r--r-- | pkix/src/main/java/org/bouncycastle/cms/jcajce/CMSUtils.java | 4 | ||||
| -rw-r--r-- | pkix/src/main/java/org/bouncycastle/cms/jcajce/EnvelopedDataHelper.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkix/src/main/java/org/bouncycastle/cms/jcajce/CMSUtils.java b/pkix/src/main/java/org/bouncycastle/cms/jcajce/CMSUtils.java index bd36b73c..3547ff6f 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/jcajce/CMSUtils.java +++ b/pkix/src/main/java/org/bouncycastle/cms/jcajce/CMSUtils.java @@ -7,8 +7,8 @@ import java.security.cert.X509Certificate; import org.bouncycastle.asn1.ASN1OctetString; import org.bouncycastle.asn1.cms.IssuerAndSerialNumber; import org.bouncycastle.asn1.x509.Certificate; +import org.bouncycastle.asn1.x509.Extension; import org.bouncycastle.asn1.x509.TBSCertificateStructure; -import org.bouncycastle.asn1.x509.X509Extension; class CMSUtils { @@ -30,7 +30,7 @@ class CMSUtils static byte[] getSubjectKeyId(X509Certificate cert) { - byte[] ext = cert.getExtensionValue(X509Extension.subjectKeyIdentifier.getId()); + byte[] ext = cert.getExtensionValue(Extension.subjectKeyIdentifier.getId()); if (ext != null) { diff --git a/pkix/src/main/java/org/bouncycastle/cms/jcajce/EnvelopedDataHelper.java b/pkix/src/main/java/org/bouncycastle/cms/jcajce/EnvelopedDataHelper.java index ece1a612..915593b5 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/jcajce/EnvelopedDataHelper.java +++ b/pkix/src/main/java/org/bouncycastle/cms/jcajce/EnvelopedDataHelper.java @@ -64,6 +64,7 @@ public class EnvelopedDataHelper BASE_CIPHER_NAMES.put(CMSAlgorithm.CAMELLIA192_CBC, "Camellia"); BASE_CIPHER_NAMES.put(CMSAlgorithm.CAMELLIA256_CBC, "Camellia"); BASE_CIPHER_NAMES.put(CMSAlgorithm.SEED_CBC, "SEED"); + BASE_CIPHER_NAMES.put(PKCSObjectIdentifiers.rc4, "RC4"); CIPHER_ALG_NAMES.put(CMSAlgorithm.DES_CBC, "DES/CBC/PKCS5Padding"); CIPHER_ALG_NAMES.put(CMSAlgorithm.RC2_CBC, "RC2/CBC/PKCS5Padding"); @@ -77,6 +78,7 @@ public class EnvelopedDataHelper CIPHER_ALG_NAMES.put(CMSAlgorithm.CAMELLIA192_CBC, "Camellia/CBC/PKCS5Padding"); CIPHER_ALG_NAMES.put(CMSAlgorithm.CAMELLIA256_CBC, "Camellia/CBC/PKCS5Padding"); CIPHER_ALG_NAMES.put(CMSAlgorithm.SEED_CBC, "SEED/CBC/PKCS5Padding"); + CIPHER_ALG_NAMES.put(PKCSObjectIdentifiers.rc4, "RC4"); MAC_ALG_NAMES.put(CMSAlgorithm.DES_EDE3_CBC, "DESEDEMac"); MAC_ALG_NAMES.put(CMSAlgorithm.AES128_CBC, "AESMac"); |