Skip to content

Commit 35b543f

Browse files
Fix bug where private key was getting overwritten by cert env variable
1 parent 233135d commit 35b543f

File tree

1 file changed

+2
-2
lines changed
  • loader-common/src/main/java/me/mrnavastar/protoweaver/loader/netty

1 file changed

+2
-2
lines changed

loader-common/src/main/java/me/mrnavastar/protoweaver/loader/netty/SSLContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static void init(String dir) {
3939
Security.addProvider(new BouncyCastleProvider());
4040

4141
Optional.ofNullable(System.getenv("PROTOWEAVER_PRIVATE_KEY")).ifPresent(value -> privateKey = new ByteArrayInputStream(value.getBytes(StandardCharsets.UTF_8)));
42-
Optional.ofNullable(System.getenv("PROTOWEAVER_CERT")).ifPresent(value -> privateKey = new ByteArrayInputStream(value.getBytes(StandardCharsets.UTF_8)));
42+
Optional.ofNullable(System.getenv("PROTOWEAVER_CERT")).ifPresent(value -> cert = new ByteArrayInputStream(value.getBytes(StandardCharsets.UTF_8)));
4343

4444
genKeys(dir);
4545
context = SslContextBuilder.forServer(cert, privateKey)
@@ -99,4 +99,4 @@ private static X509Certificate genCert(KeyPair keyPair) throws OperatorCreationE
9999

100100
return new JcaX509CertificateConverter().setProvider(bcProvider).getCertificate(certBuilder.build(contentSigner));
101101
}
102-
}
102+
}

0 commit comments

Comments
 (0)