Skip to content

Commit 0151bd8

Browse files
committed
Merge pull request lightbody#353 from jekh/add-ec-builder-for-mitm
Add EC builder to ImpersonatingMitmManager
2 parents c291112 + f616a83 commit 0151bd8

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

mitm/src/main/java/net/lightbody/bmp/mitm/manager/ImpersonatingMitmManager.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import net.lightbody.bmp.mitm.RootCertificateGenerator;
1313
import net.lightbody.bmp.mitm.exception.MitmException;
1414
import net.lightbody.bmp.mitm.exception.SslContextInitializationException;
15+
import net.lightbody.bmp.mitm.keys.ECKeyGenerator;
1516
import net.lightbody.bmp.mitm.keys.KeyGenerator;
1617
import net.lightbody.bmp.mitm.keys.RSAKeyGenerator;
1718
import net.lightbody.bmp.mitm.stats.CertificateGenerationStatistics;
@@ -300,12 +301,25 @@ public CertificateGenerationStatistics getStatistics() {
300301
}
301302

302303
/**
303-
* Convenience method to return a new {@link Builder} instance.
304+
* Convenience method to return a new {@link Builder} instance default default values: a {@link RootCertificateGenerator}
305+
* that dynamically generates an RSA root certificate and RSA server certificates.
304306
*/
305307
public static Builder builder() {
306308
return new Builder();
307309
}
308310

311+
/**
312+
* Convenience method to return a new {@link Builder} instance that will dynamically create EC root certificates and
313+
* EC server certificates, but otherwise uses default values.
314+
*/
315+
public static Builder builderWithECC() {
316+
return new Builder()
317+
.serverKeyGenerator(new ECKeyGenerator())
318+
.rootCertificateSource(RootCertificateGenerator.builder()
319+
.keyGenerator(new ECKeyGenerator())
320+
.build());
321+
}
322+
309323
/**
310324
* A Builder for {@link ImpersonatingMitmManager}s. Initialized with suitable default values suitable for most purposes.
311325
*/

0 commit comments

Comments
 (0)