Skip to content

Add EC builder to ImpersonatingMitmManager #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 1, 2016
Merged

Add EC builder to ImpersonatingMitmManager #353

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion mitm/src/main/java/net/lightbody/bmp/mitm/manager/ImpersonatingMitmManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import net.lightbody.bmp.mitm.RootCertificateGenerator;
import net.lightbody.bmp.mitm.exception.MitmException;
import net.lightbody.bmp.mitm.exception.SslContextInitializationException;
import net.lightbody.bmp.mitm.keys.ECKeyGenerator;
import net.lightbody.bmp.mitm.keys.KeyGenerator;
import net.lightbody.bmp.mitm.keys.RSAKeyGenerator;
import net.lightbody.bmp.mitm.stats.CertificateGenerationStatistics;
Expand Down Expand Up @@ -300,12 +301,25 @@ public CertificateGenerationStatistics getStatistics() {
}

/**
* Convenience method to return a new {@link Builder} instance.
* Convenience method to return a new {@link Builder} instance default default values: a {@link RootCertificateGenerator}
* that dynamically generates an RSA root certificate and RSA server certificates.
*/
public static Builder builder() {
return new Builder();
}

/**
* Convenience method to return a new {@link Builder} instance that will dynamically create EC root certificates and
* EC server certificates, but otherwise uses default values.
*/
public static Builder builderWithECC() {
return new Builder()
.serverKeyGenerator(new ECKeyGenerator())
.rootCertificateSource(RootCertificateGenerator.builder()
.keyGenerator(new ECKeyGenerator())
.build());
}

/**
* A Builder for {@link ImpersonatingMitmManager}s. Initialized with suitable default values suitable for most purposes.
*/
Expand Down