summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorluccioman <luccioman@users.noreply.github.com>2018-09-21 12:07:57 +0200
committerluccioman <luccioman@users.noreply.github.com>2018-09-21 12:07:57 +0200
commit982179a7ebea3c64299990ff638a74a655f179b7 (patch)
tree5fdfb53ebabc560e42e9e5844a2ffe344dbeef54 /lib
parentc409ec089c39e0adad5a2d63e1a9bb69688de19c (diff)
Upgraded BouncyCastle dependencies from jdk15:1.46 to jdk15on:1.60
Diffstat (limited to 'lib')
-rw-r--r--lib/bcmail-jdk15-1.46.jarbin487135 -> 0 bytes
-rw-r--r--lib/bcmail-jdk15on-1.60.License (renamed from lib/bcmail-jdk15-1.46.License)6
-rw-r--r--lib/bcmail-jdk15on-1.60.jarbin0 -> 108233 bytes
-rw-r--r--lib/bcpkix-jdk15on-1.60.License (renamed from lib/bcprov-jdk15-1.46.License)6
-rw-r--r--lib/bcpkix-jdk15on-1.60.jarbin0 -> 796532 bytes
-rw-r--r--lib/bcprov-jdk15-1.46.jarbin1815677 -> 0 bytes
-rw-r--r--lib/bcprov-jdk15on-1.60.License16
-rw-r--r--lib/bcprov-jdk15on-1.60.jarbin0 -> 4189874 bytes
8 files changed, 24 insertions, 4 deletions
diff --git a/lib/bcmail-jdk15-1.46.jar b/lib/bcmail-jdk15-1.46.jar
deleted file mode 100644
index de560b515..000000000
--- a/lib/bcmail-jdk15-1.46.jar
+++ /dev/null
Binary files differ
diff --git a/lib/bcmail-jdk15-1.46.License b/lib/bcmail-jdk15on-1.60.License
index 915568469..398ca734d 100644
--- a/lib/bcmail-jdk15-1.46.License
+++ b/lib/bcmail-jdk15on-1.60.License
@@ -3,12 +3,14 @@
The Legion of the Bouncy Castle
Please note this should be read in the same way as the MIT license.
+
+Please also note this licensing model is made possible through funding from donations and the sale of support contracts.
License
-Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000 - 2018 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file
diff --git a/lib/bcmail-jdk15on-1.60.jar b/lib/bcmail-jdk15on-1.60.jar
new file mode 100644
index 000000000..215641b74
--- /dev/null
+++ b/lib/bcmail-jdk15on-1.60.jar
Binary files differ
diff --git a/lib/bcprov-jdk15-1.46.License b/lib/bcpkix-jdk15on-1.60.License
index 915568469..398ca734d 100644
--- a/lib/bcprov-jdk15-1.46.License
+++ b/lib/bcpkix-jdk15on-1.60.License
@@ -3,12 +3,14 @@
The Legion of the Bouncy Castle
Please note this should be read in the same way as the MIT license.
+
+Please also note this licensing model is made possible through funding from donations and the sale of support contracts.
License
-Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000 - 2018 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file
diff --git a/lib/bcpkix-jdk15on-1.60.jar b/lib/bcpkix-jdk15on-1.60.jar
new file mode 100644
index 000000000..87ce8b473
--- /dev/null
+++ b/lib/bcpkix-jdk15on-1.60.jar
Binary files differ
diff --git a/lib/bcprov-jdk15-1.46.jar b/lib/bcprov-jdk15-1.46.jar
deleted file mode 100644
index daa0b54cc..000000000
--- a/lib/bcprov-jdk15-1.46.jar
+++ /dev/null
Binary files differ
diff --git a/lib/bcprov-jdk15on-1.60.License b/lib/bcprov-jdk15on-1.60.License
new file mode 100644
index 000000000..398ca734d
--- /dev/null
+++ b/lib/bcprov-jdk15on-1.60.License
@@ -0,0 +1,16 @@
+(taken from http://www.bouncycastle.org/licence.html)
+
+The Legion of the Bouncy Castle
+
+Please note this should be read in the same way as the MIT license.
+
+Please also note this licensing model is made possible through funding from donations and the sale of support contracts.
+License
+
+Copyright (c) 2000 - 2018 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file
diff --git a/lib/bcprov-jdk15on-1.60.jar b/lib/bcprov-jdk15on-1.60.jar
new file mode 100644
index 000000000..5be567cbb
--- /dev/null
+++ b/lib/bcprov-jdk15on-1.60.jar
Binary files differ