diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2022-10-01 19:34:23 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2022-10-01 19:34:23 +0200 |
| commit | 45a28199fc9e32629c26b078d737f6b123d9dc1f (patch) | |
| tree | 5df1e63b9226431c7ef935477a4af9d94c228d4f /src/main/resources | |
| parent | 5a968fa0d10fe03794ecd1e6bc9f0d3834abfac3 (diff) | |
| parent | 2dd4a2b36211c380c0bf4e231859dfafd3c04a5b (diff) | |
| download | NotEnoughUpdates-45a28199fc9e32629c26b078d737f6b123d9dc1f.tar.gz NotEnoughUpdates-45a28199fc9e32629c26b078d737f6b123d9dc1f.tar.bz2 NotEnoughUpdates-45a28199fc9e32629c26b078d737f6b123d9dc1f.zip | |
Merge branch 'master' into minion_helper_2
# Conflicts:
# src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BingoPage.java
# src/main/java/io/github/moulberry/notenoughupdates/util/HotmInformation.java
# src/main/java/io/github/moulberry/notenoughupdates/util/HypixelApi.java
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/neukeystore.jks | bin | 0 -> 101958 bytes | |||
| -rw-r--r-- | src/main/resources/neukeystore.txt | 17 | ||||
| -rw-r--r-- | src/main/resources/pronoundb.jks | bin | 1457 -> 0 bytes |
3 files changed, 17 insertions, 0 deletions
diff --git a/src/main/resources/neukeystore.jks b/src/main/resources/neukeystore.jks Binary files differnew file mode 100644 index 00000000..3a5a23b6 --- /dev/null +++ b/src/main/resources/neukeystore.jks diff --git a/src/main/resources/neukeystore.txt b/src/main/resources/neukeystore.txt new file mode 100644 index 00000000..5616f69b --- /dev/null +++ b/src/main/resources/neukeystore.txt @@ -0,0 +1,17 @@ +neukeystore.jks +=============== + +This file should only ever be handled by a `keytool` binary from jdk 1.8u51 or below, as to be compatible with old java versions. + +The password to the keystore is `neuneu` and it contains every certificate from jdk 1.8u51 and the Let's Encrypt root CAs. + +Example for adding a new certificate: + + ~/.jdks/jdk1.8.0_51/bin/keytool -keystore neukeystore.jks -storepass neuneu -alias ISRGROOTX1 -import -file isrgrootx1.der + +Please keep a list of added aliases below: + + - ISRGROOTX1 (Let's Encrypt) + - ISRGROOTX2 (Let's Encrypt) + + diff --git a/src/main/resources/pronoundb.jks b/src/main/resources/pronoundb.jks Binary files differdeleted file mode 100644 index 1c279333..00000000 --- a/src/main/resources/pronoundb.jks +++ /dev/null |