Skip to content

Commit 55c2146

Browse files
author
bouncy
committed
updates
1 parent b3a501d commit 55c2146

File tree

9 files changed

+43
-48
lines changed

9 files changed

+43
-48
lines changed

‎jdk1.1/org/bouncycastle/openpgp/operator/jcajce/JcaPGPContentSignerBuilder.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import java.security.Signature;
88
import java.security.SignatureException;
99

10-
import org.bouncycastle.jcajce.DefaultJcaJceHelper;
11-
import org.bouncycastle.jcajce.NamedJcaJceHelper;
12-
import org.bouncycastle.jcajce.ProviderJcaJceHelper;
10+
import org.bouncycastle.cms.jcajce.DefaultJcaJceExtHelper;
11+
import org.bouncycastle.cms.jcajce.NamedJcaJceExtHelper;
12+
import org.bouncycastle.cms.jcajce.ProviderJcaJceExtHelper;
1313
import org.bouncycastle.openpgp.PGPException;
1414
import org.bouncycastle.openpgp.PGPPrivateKey;
1515
import org.bouncycastle.openpgp.operator.PGPContentSigner;
@@ -20,7 +20,7 @@
2020
public class JcaPGPContentSignerBuilder
2121
implements PGPContentSignerBuilder
2222
{
23-
private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
23+
private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceExtHelper());
2424
private JcaPGPDigestCalculatorProviderBuilder digestCalculatorProviderBuilder = new JcaPGPDigestCalculatorProviderBuilder();
2525
private JcaPGPKeyConverter keyConverter = new JcaPGPKeyConverter();
2626
private int hashAlgorithm;
@@ -42,7 +42,7 @@ public JcaPGPContentSignerBuilder setSecureRandom(SecureRandom random)
4242

4343
public JcaPGPContentSignerBuilder setProvider(Provider provider)
4444
{
45-
this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
45+
this.helper = new OperatorHelper(new ProviderJcaJceExtHelper(provider));
4646
keyConverter.setProvider(provider);
4747
digestCalculatorProviderBuilder.setProvider(provider);
4848

@@ -51,7 +51,7 @@ public JcaPGPContentSignerBuilder setProvider(Provider provider)
5151

5252
public JcaPGPContentSignerBuilder setProvider(String providerName)
5353
{
54-
this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
54+
this.helper = new OperatorHelper(new NamedJcaJceExtHelper(providerName));
5555
keyConverter.setProvider(providerName);
5656
digestCalculatorProviderBuilder.setProvider(providerName);
5757

‎jdk1.1/org/bouncycastle/openpgp/operator/jcajce/OperatorHelper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import java.io.InputStream;
44
import java.security.GeneralSecurityException;
5-
import java.security.NoSuchProviderException;
6-
import java.security.NoSuchAlgorithmException;
75
import java.security.KeyFactory;
86
import java.security.MessageDigest;
7+
import java.security.NoSuchAlgorithmException;
8+
import java.security.NoSuchProviderException;
99
import java.security.Signature;
1010

1111
import javax.crypto.Cipher;
@@ -15,17 +15,17 @@
1515
import javax.crypto.spec.SecretKeySpec;
1616

1717
import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
18-
import org.bouncycastle.jcajce.JcaJceHelper;
18+
import org.bouncycastle.cms.jcajce.JcaJceExtHelper;
1919
import org.bouncycastle.openpgp.PGPException;
2020
import org.bouncycastle.openpgp.PGPPublicKey;
2121
import org.bouncycastle.openpgp.operator.PGPDataDecryptor;
2222
import org.bouncycastle.openpgp.operator.PGPDigestCalculator;
2323

2424
class OperatorHelper
2525
{
26-
private JcaJceHelper helper;
26+
private JcaJceExtHelper helper;
2727

28-
OperatorHelper(JcaJceHelper helper)
28+
OperatorHelper(JcaJceExtHelper helper)
2929
{
3030
this.helper = helper;
3131
}

‎jdk1.1/org/bouncycastle/operator/jcajce/JcaContentSignerBuilder.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import java.security.SignatureException;
1212

1313
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
14-
import org.bouncycastle.jcajce.DefaultJcaJceHelper;
15-
import org.bouncycastle.jcajce.NamedJcaJceHelper;
16-
import org.bouncycastle.jcajce.ProviderJcaJceHelper;
14+
import org.bouncycastle.cms.jcajce.DefaultJcaJceExtHelper;
15+
import org.bouncycastle.cms.jcajce.NamedJcaJceExtHelper;
16+
import org.bouncycastle.cms.jcajce.ProviderJcaJceExtHelper;
1717
import org.bouncycastle.operator.ContentSigner;
1818
import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
1919
import org.bouncycastle.operator.OperatorCreationException;
@@ -22,7 +22,7 @@
2222

2323
public class JcaContentSignerBuilder
2424
{
25-
private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
25+
private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceExtHelper());
2626
private SecureRandom random;
2727
private String signatureAlgorithm;
2828
private AlgorithmIdentifier sigAlgId;
@@ -35,14 +35,14 @@ public JcaContentSignerBuilder(String signatureAlgorithm)
3535

3636
public JcaContentSignerBuilder setProvider(Provider provider)
3737
{
38-
this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
38+
this.helper = new OperatorHelper(new ProviderJcaJceExtHelper(provider));
3939

4040
return this;
4141
}
4242

4343
public JcaContentSignerBuilder setProvider(String providerName)
4444
{
45-
this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
45+
this.helper = new OperatorHelper(new NamedJcaJceExtHelper(providerName));
4646

4747
return this;
4848
}

‎jdk1.1/org/bouncycastle/operator/jcajce/JceAsymmetricKeyUnwrapper.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package org.bouncycastle.operator.jcajce;
22

3-
import java.security.GeneralSecurityException;
4-
import java.security.NoSuchAlgorithmException;
53
import java.security.InvalidKeyException;
64
import java.security.Key;
5+
import java.security.NoSuchAlgorithmException;
76
import java.security.PrivateKey;
87
import java.security.Provider;
98
import java.security.ProviderException;
@@ -14,17 +13,17 @@
1413
import javax.crypto.spec.SecretKeySpec;
1514

1615
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
17-
import org.bouncycastle.jcajce.DefaultJcaJceHelper;
18-
import org.bouncycastle.jcajce.NamedJcaJceHelper;
19-
import org.bouncycastle.jcajce.ProviderJcaJceHelper;
16+
import org.bouncycastle.cms.jcajce.DefaultJcaJceExtHelper;
17+
import org.bouncycastle.cms.jcajce.NamedJcaJceExtHelper;
18+
import org.bouncycastle.cms.jcajce.ProviderJcaJceExtHelper;
2019
import org.bouncycastle.operator.AsymmetricKeyUnwrapper;
2120
import org.bouncycastle.operator.GenericKey;
2221
import org.bouncycastle.operator.OperatorException;
2322

2423
public class JceAsymmetricKeyUnwrapper
2524
extends AsymmetricKeyUnwrapper
2625
{
27-
private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
26+
private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceExtHelper());
2827
private PrivateKey privKey;
2928

3029
public JceAsymmetricKeyUnwrapper(AlgorithmIdentifier algorithmIdentifier, PrivateKey privKey)
@@ -36,14 +35,14 @@ public JceAsymmetricKeyUnwrapper(AlgorithmIdentifier algorithmIdentifier, Privat
3635

3736
public JceAsymmetricKeyUnwrapper setProvider(Provider provider)
3837
{
39-
this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
38+
this.helper = new OperatorHelper(new ProviderJcaJceExtHelper(provider));
4039

4140
return this;
4241
}
4342

4443
public JceAsymmetricKeyUnwrapper setProvider(String providerName)
4544
{
46-
this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
45+
this.helper = new OperatorHelper(new NamedJcaJceExtHelper(providerName));
4746

4847
return this;
4948
}

‎jdk1.1/org/bouncycastle/operator/jcajce/OperatorHelper.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.io.ByteArrayInputStream;
44
import java.io.IOException;
5-
import java.security.AlgorithmParameters;
65
import java.security.GeneralSecurityException;
76
import java.security.MessageDigest;
87
import java.security.NoSuchAlgorithmException;
@@ -31,7 +30,7 @@
3130
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
3231
import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
3332
import org.bouncycastle.cert.X509CertificateHolder;
34-
import org.bouncycastle.jcajce.JcaJceHelper;
33+
import org.bouncycastle.cms.jcajce.JcaJceExtHelper;
3534
import org.bouncycastle.operator.OperatorCreationException;
3635

3736
class OperatorHelper
@@ -88,9 +87,9 @@ class OperatorHelper
8887
symmetricKeyAlgNames.put(PKCSObjectIdentifiers.RC2_CBC, "RC2");
8988
}
9089

91-
private JcaJceHelper helper;
90+
private JcaJceExtHelper helper;
9291

93-
OperatorHelper(JcaJceHelper helper)
92+
OperatorHelper(JcaJceExtHelper helper)
9493
{
9594
this.helper = helper;
9695
}

‎jdk1.3/org/bouncycastle/cert/crmf/jcajce/JcaCertificateRequestMessage.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@
44
import java.security.PublicKey;
55

66
import org.bouncycastle.asn1.crmf.CertReqMsg;
7-
import org.bouncycastle.asn1.x500.X500Name;
87
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
98
import org.bouncycastle.cert.crmf.CRMFException;
109
import org.bouncycastle.cert.crmf.CertificateRequestMessage;
11-
import org.bouncycastle.jcajce.DefaultJcaJceHelper;
12-
import org.bouncycastle.jcajce.NamedJcaJceHelper;
13-
import org.bouncycastle.jcajce.ProviderJcaJceHelper;
10+
import org.bouncycastle.cms.jcajce.DefaultJcaJceExtHelper;
11+
import org.bouncycastle.cms.jcajce.NamedJcaJceExtHelper;
12+
import org.bouncycastle.cms.jcajce.ProviderJcaJceExtHelper;
1413

1514
public class JcaCertificateRequestMessage
1615
extends CertificateRequestMessage
1716
{
18-
private CRMFHelper helper = new CRMFHelper(new DefaultJcaJceHelper());
17+
private CRMFHelper helper = new CRMFHelper(new DefaultJcaJceExtHelper());
1918

2019
public JcaCertificateRequestMessage(CertificateRequestMessage certReqMsg)
2120
{
@@ -29,14 +28,14 @@ public JcaCertificateRequestMessage(CertReqMsg certReqMsg)
2928

3029
public JcaCertificateRequestMessage setProvider(String providerName)
3130
{
32-
this.helper = new CRMFHelper(new NamedJcaJceHelper(providerName));
31+
this.helper = new CRMFHelper(new NamedJcaJceExtHelper(providerName));
3332

3433
return this;
3534
}
3635

3736
public JcaCertificateRequestMessage setProvider(Provider provider)
3837
{
39-
this.helper = new CRMFHelper(new ProviderJcaJceHelper(provider));
38+
this.helper = new CRMFHelper(new ProviderJcaJceExtHelper(provider));
4039

4140
return this;
4241
}

‎jdk1.3/org/bouncycastle/jcajce/ProviderJcaJceHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
2121
import javax.crypto.SecretKey;
2222

2323
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
24+
import org.bouncycastle.cms.jcajce.JcaJceExtHelper;
2425
import org.bouncycastle.operator.AsymmetricKeyUnwrapper;
2526
import org.bouncycastle.operator.SymmetricKeyUnwrapper;
2627
import org.bouncycastle.operator.jcajce.JceAsymmetricKeyUnwrapper;
2728
import org.bouncycastle.operator.jcajce.JceSymmetricKeyUnwrapper;
2829

2930
public class ProviderJcaJceHelper
30-
implements JcaJceHelper
31+
implements JcaJceExtHelper
3132
{
3233
private final Provider provider;
3334

‎jdk1.3/org/bouncycastle/operator/jcajce/OperatorHelper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.io.ByteArrayInputStream;
44
import java.io.IOException;
5-
import java.security.AlgorithmParameters;
65
import java.security.GeneralSecurityException;
76
import java.security.MessageDigest;
87
import java.security.NoSuchAlgorithmException;
@@ -11,7 +10,6 @@
1110
import java.security.cert.CertificateException;
1211
import java.security.cert.CertificateFactory;
1312
import java.security.cert.X509Certificate;
14-
//import java.security.spec.PSSParameterSpec;
1513
import java.util.HashMap;
1614
import java.util.Map;
1715

@@ -32,9 +30,11 @@
3230
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
3331
import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
3432
import org.bouncycastle.cert.X509CertificateHolder;
35-
import org.bouncycastle.jcajce.JcaJceHelper;
33+
import org.bouncycastle.cms.jcajce.JcaJceExtHelper;
3634
import org.bouncycastle.operator.OperatorCreationException;
3735

36+
//import java.security.spec.PSSParameterSpec;
37+
3838
class OperatorHelper
3939
{
4040
private static final Map oids = new HashMap();
@@ -89,9 +89,9 @@ class OperatorHelper
8989
symmetricKeyAlgNames.put(PKCSObjectIdentifiers.RC2_CBC, "RC2");
9090
}
9191

92-
private JcaJceHelper helper;
92+
private JcaJceExtHelper helper;
9393

94-
OperatorHelper(JcaJceHelper helper)
94+
OperatorHelper(JcaJceExtHelper helper)
9595
{
9696
this.helper = helper;
9797
}

‎jdk1.4/org/bouncycastle/cms/jcajce/JceKeyAgreeRecipientInfoGenerator.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
import org.bouncycastle.cms.CMSEnvelopedGenerator;
3535
import org.bouncycastle.cms.CMSException;
3636
import org.bouncycastle.cms.KeyAgreeRecipientInfoGenerator;
37-
import org.bouncycastle.jcajce.DefaultJcaJceHelper;
38-
import org.bouncycastle.jcajce.NamedJcaJceHelper;
39-
import org.bouncycastle.jcajce.ProviderJcaJceHelper;
4037
import org.bouncycastle.jce.interfaces.ECPublicKey;
4138
import org.bouncycastle.jce.spec.ECParameterSpec;
4239
import org.bouncycastle.jce.spec.MQVPrivateKeySpec;
@@ -51,7 +48,7 @@ public class JceKeyAgreeRecipientInfoGenerator
5148
private PublicKey senderPublicKey;
5249
private PrivateKey senderPrivateKey;
5350

54-
private EnvelopedDataHelper helper = new EnvelopedDataHelper(new DefaultJcaJceHelper());
51+
private EnvelopedDataHelper helper = new EnvelopedDataHelper(new DefaultJcaJceExtHelper());
5552
private SecureRandom random;
5653
private KeyPair ephemeralKP;
5754

@@ -65,14 +62,14 @@ public JceKeyAgreeRecipientInfoGenerator(ASN1ObjectIdentifier keyAgreementOID, P
6562

6663
public JceKeyAgreeRecipientInfoGenerator setProvider(Provider provider)
6764
{
68-
this.helper = new EnvelopedDataHelper(new ProviderJcaJceHelper(provider));
65+
this.helper = new EnvelopedDataHelper(new ProviderJcaJceExtHelper(provider));
6966

7067
return this;
7168
}
7269

7370
public JceKeyAgreeRecipientInfoGenerator setProvider(String providerName)
7471
{
75-
this.helper = new EnvelopedDataHelper(new NamedJcaJceHelper(providerName));
72+
this.helper = new EnvelopedDataHelper(new NamedJcaJceExtHelper(providerName));
7673

7774
return this;
7875
}

0 commit comments

Comments
 (0)