rtyley · Erhannis · Jul 21, 2021 · Jul 24, 2021 · Jul 24, 2021 · Jul 24, 2021
diff --git a/.gitattributes b/.gitattributes
@@ -7,6 +7,7 @@
 *.html     text diff=html
 *.java     text diff=java
 *.pem      text
+#*.rsp      text
 *.tmpl     text
 
 # Denote all files that are truly binary and should not be modified.

diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+language: java
+jdk:
+  - openjdk8
diff --git a/CONTRIBUTORS.html b/CONTRIBUTORS.html
diff --git a/LICENSE.html b/LICENSE.html
@@ -1,7 +1,7 @@
 <html>
 <body bgcolor=#ffffff>
 
-Copyright (c) 2000-2017 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000-2021 The Legion of the Bouncy Castle Inc. (https://www.spongycastle.org)
 <p>
 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, 

diff --git a/README.md b/README.md
@@ -1,31 +1,35 @@
 # The Bouncy Castle Crypto Package For Java
 
-The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms, it was developed by the Legion of the Bouncy Castle, a registered Australian Charity, with a little help! The Legion, and the latest goings on with this package, can be found at [http://www.bouncycastle.org](http://www.bouncycastle.org).
+[![Build Status](https://travis-ci.org/bcgit/bc-java.svg?branch=master)](https://travis-ci.org/bcgit/bc-java)
 
-The Legion also gratefully acknowledges the contributions made to this package by others (see [here](http://www.bouncycastle.org/contributors.html) for the current list). If you would like to contribute to our efforts please feel free to get in touch with us or visit our [donations page](https://www.bouncycastle.org/donate), sponsor some specific work, or purchase a support contract through [Crypto Workshop](http://www.cryptoworkshop.com).
+The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms, it was developed by the Legion of the Bouncy Castle, a registered Australian Charity, with a little help! The Legion, and the latest goings on with this package, can be found at [https://www.spongycastle.org](https://www.spongycastle.org).
+
+The Legion also gratefully acknowledges the contributions made to this package by others (see [here](https://www.spongycastle.org/contributors.html) for the current list). If you would like to contribute to our efforts please feel free to get in touch with us or visit our [donations page](https://www.spongycastle.org/donate), sponsor some specific work, or purchase a support contract through [Crypto Workshop](https://www.cryptoworkshop.com).
 
 The package is organised so that it contains a light-weight API suitable for use in any environment (including the newly released J2ME) with the additional infrastructure to conform the algorithms to the JCE framework.
 
-Except where otherwise stated, this software is distributed under a license based on the MIT X Consortium license. To view the license, [see here](http://www.bouncycastle.org/licence.html). The OpenPGP library also includes a modified BZIP2 library which is licensed under the [Apache Software License, Version 2.0](http://www.apache.org/licenses/). 
+Except where otherwise stated, this software is distributed under a license based on the MIT X Consortium license. To view the license, [see here](https://www.spongycastle.org/licence.html). The OpenPGP library also includes a modified BZIP2 library which is licensed under the [Apache Software License, Version 2.0](https://www.apache.org/licenses/). 
 
-**Note**: this source tree is not the FIPS version of the APIs - if you are interested in our FIPS version please contact us directly at  [office@bouncycastle.org](mailto:office@bouncycastle.org).
+**Note**: this source tree is not the FIPS version of the APIs - if you are interested in our FIPS version please contact us directly at  [office.spongycastle.org](mailto:office.spongycastle.org).
 
 ## Code Organisation
 
-The clean room JCE, for use with JDK 1.1 to JDK 1.3 is in the jce/src/main/java directory.
+The clean room JCE, for use with JDK 1.1 to JDK 1.3 is in the jce/src/main/java directory. From JDK 1.4 and later the JCE ships with the JVM, the source for later JDKs follows the progress that was made in the later versions of the JCE. If you are using a later version of the JDK which comes with a JCE install please **do not** include the jce directory as a source file as it will clash with the JCE API installed with your JDK.
 
 The **core** module provides all the functionality in the ligthweight APIs.
 
 The **prov** module provides all the JCA/JCE provider functionality.
 
+The **util** module is the home for code which is used by other modules that does not need to be in prov. At the moment this is largely ASN.1 classes for the PKIX module.
+
 The **pkix** module is the home for code for X.509 certificate generation and the APIs for standards that rely on ASN.1 such
 as CMS, TSP, PKCS#12, OCSP, CRMF, and CMP.
 
 The **mail** module provides an S/MIME API built on top of CMS.
 
 The **pg** module is the home for code used to support OpenPGP.
 
-The **tls** module is the home for code used to a general TLS API and JSSE Provider (as at 1.56 this should be considered a beta).
+The **tls** module is the home for code used to a general TLS API and JSSE Provider.
 
 The build scripts that come with the full distribution allow creation of the different releases by using the different source trees while excluding classes that are not appropriate and copying in the required compatibility classes from the directories containing compatibility classes appropriate for the distribution.
 
@@ -36,40 +40,40 @@ If you want to try create a build for yourself, using your own environment, the
 
 To view some examples, look at the test programs in the packages:
 
-*   **org.bouncycastle.crypto.test**
+*   **org.spongycastle.crypto.test**
 
-*   **org.bouncycastle.jce.provider.test**
+*   **org.spongycastle.jce.provider.test**
 
-*   **org.bouncycastle.cms.test**
+*   **org.spongycastle.cms.test**
 
-*   **org.bouncycastle.mail.smime.test**
+*   **org.spongycastle.mail.smime.test**
 
-*   **org.bouncycastle.openpgp.test**
+*   **org.spongycastle.openpgp.test**
 
-*   **org.bouncycastle.tsp.test**
+*   **org.spongycastle.tsp.test**
 
 There are also some specific example programs for dealing with SMIME and OpenPGP. They can be found in:
 
-*   **org.bouncycastle.mail.smime.examples**
+*   **org.spongycastle.mail.smime.examples**
 
-*   **org.bouncycastle.openpgp.examples**
+*   **org.spongycastle.openpgp.examples**
 
 ## Mailing Lists
 
 For those who are interested, there are 2 mailing lists for participation in this project. To subscribe use the links below and include the word subscribe in the message body. (To unsubscribe, replace **subscribe** with **unsubscribe** in the message body)
 
-*   [announce-crypto-request@bouncycastle.org](mailto:announce-crypto-request@bouncycastle.org)  
+*   [announce-crypto-request.spongycastle.org](mailto:announce-crypto-request.spongycastle.org)  
     This mailing list is for new release announcements only, general subscribers cannot post to it.
-*   [dev-crypto-request@bouncycastle.org](mailto:dev-crypto-request@bouncycastle.org)  
+*   [dev-crypto-request.spongycastle.org](mailto:dev-crypto-request.spongycastle.org)  
     This mailing list is for discussion of development of the package. This includes bugs, comments, requests for enhancements, questions about use or operation.
 
-**NOTE:**You need to be subscribed to send mail to the above mailing list.
+**NOTE:** You need to be subscribed to send mail to the above mailing list.
 
-## Feedback 
+## Feedback and Contributions
 
-If you want to provide feedback directly to the members of **The Legion** then please use [feedback-crypto@bouncycastle.org](mailto:feedback-crypto@bouncycastle.org), if you want to help this project survive please consider [donating](https://www.bouncycastle.org/donate).
+If you want to provide feedback directly to the members of **The Legion** then please use [feedback-crypto.spongycastle.org](mailto:feedback-crypto.spongycastle.org), if you want to help this project survive please consider [donating](https://www.spongycastle.org/donate).
 
-For bug reporting/requests you can report issues here on github, via feedback-crypto if required, and we also have a [Jira issue tracker](http://www.bouncycastle.org/jira). We will accept pull requests based on this repository as well.
+For bug reporting/requests you can report issues here on github, or via feedback-crypto if required. We will accept pull requests based on this repository as well, but only on the basis that any code included may be distributed under the [Bouncy Castle License](https://www.spongycastle.org/licence.html).
 
 ## Finally
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,5 @@
+# Reporting a security issue
+
+If you would like to report something you believe to be a security issue
+then please use feedback-crypto.spongycastle.org. 
+We can provide a PGP key if required.
diff --git a/add_module.sh b/add_module.sh
@@ -0,0 +1,105 @@
+export JAVA_9=/usr/lib/jvm/java-9.0.4-oracle-x64
+export JAVA_11=/usr/lib/jvm/java-11-openjdk-amd64
+export JAVA_15=/opt/jdk-15
+
+export JAVA_HOME=$JAVA_9
+export PATH=$JAVA_HOME/bin:$PATH
+
+if [ $# -ne 1 ]
+then
+   echo "usage: add_module.sh prov|prov-ext|util|tls|pg|pkix|mail|jmail"
+   exit 0
+fi 
+
+for jarName in bc$1-jdk15on-*.jar
+do
+
+rm -rf module.tmp
+
+# Java 9 Step
+(
+    export JAVA_HOME=$JAVA_9
+    export PATH=$JAVA_HOME/bin:$PATH
+
+    mkdir -p module.tmp/v5
+    mkdir -p module.tmp/versions/v9
+    mkdir -p module.tmp/versions/v11
+    ( cd module.tmp/v5; jar xf ../../build/artifacts/jdk1.5/jars/$jarName )
+
+    provJar=`echo build/artifacts/jdk1.5/jars/bcprov-jdk15on*.jar`
+    utilJar=`echo build/artifacts/jdk1.5/jars/bcutil-jdk15on*.jar`
+    pkixJar=`echo build/artifacts/jdk1.5/jars/bcpkix-jdk15on*.jar`
+    if [ $1 = "prov" ]
+    then
+	javac -target 1.9 -classpath module.tmp/v5 -d module.tmp/v9 `find $1/src/main/jdk1.9 -name "*.java"` -sourcepath $1/src/main/jdk1.9:$1/src/main/java:core/src/main/java
+	$JAVA_11/bin/javac -classpath module.tmp/v5 -d module.tmp/v11 `find $1/src/main/jdk1.11 -name "*.java"` -sourcepath $1/src/main/jdk1.11:$1/src/main/java:core/src/main/java
+	$JAVA_15/bin/javac -classpath module.tmp/v5:module.tmp/v11 -d module.tmp/v15 `find prov/src/main/jdk1.15 -name "*.java"` -sourcepath prov/src/main/jdk1.15:prov/src/main/jdk1.11:prov/src/main/java:core/src/main/java
+    elif [ $1 = "prov-ext" ]
+    then
+	javac -target 1.9 -classpath module.tmp/v5 -d module.tmp/v9 `find prov/src/main/ext-jdk1.9 -name "*.java"` -sourcepath prov/src/main/ext-jdk1.9:prov/src/main/java:core/src/main/java
+	$JAVA_11/bin/javac -classpath module.tmp/v5 -d module.tmp/v11 `find prov/src/main/jdk1.11 -name "*.java"` -sourcepath prov/src/main/jdk1.11:prov/src/main/java:core/src/main/java
+	$JAVA_15/bin/javac -classpath module.tmp/v5:module.tmp/v11 -d module.tmp/v15 `find prov/src/main/jdk1.15 -name "*.java"` -sourcepath prov/src/main/jdk1.15:prov/src/main/jdk1.11:prov/src/main/java:core/src/main/java
+    elif [ $1 = "mail" ]
+    then
+	javac  -target 1.9 --module-path ${provJar}:$utilJar:$pkixJar -classpath module.tmp/v5 -d module.tmp/v9 `find $1/src/main/jdk1.9 -name "*.java"` -sourcepath $1/src/main/jdk1.9:$1/src/main/java
+    elif [ $1 = "jmail" ]
+    then
+        jmailSrc=`echo build/artifacts/jdk1.5/bcjmail-jdk15on-*/src/`
+	javac  -target 1.9 --module-path ${provJar}:$utilJar:$pkixJar -classpath module.tmp/v5 -d module.tmp/v9 `find $1/src/main/jdk1.9 -name "*.java"` -sourcepath $1/src/main/jdk1.9:$jmailSrc
+    elif [ $1 = "pkix" ]
+    then
+	javac  -target 1.9 --module-path ${provJar}:$utilJar -classpath module.tmp/v5 -d module.tmp/v9 `find $1/src/main/jdk1.9 -name "*.java"` -sourcepath $1/src/main/jdk1.9:$1/src/main/java
+    elif [ $1 = "tls" ]
+    then
+	javac  -target 1.9 --module-path ${provJar}:$utilJar -classpath module.tmp/v5 -d module.tmp/v9 `find $1/src/main/jdk1.9 -name "*.java"` -sourcepath $1/src/main/jdk1.9:$1/src/main/java
+    else
+	javac  -target 1.9 --module-path $provJar -classpath module.tmp/v5 -d module.tmp/v9 `find $1/src/main/jdk1.9 -name "*.java"` -sourcepath $1/src/main/jdk1.9:$1/src/main/java
+    fi
+)
+# Java 11 Step
+(
+    export JAVA_HOME=$JAVA_11
+    export PATH=$JAVA_HOME/bin:$PATH 
+
+    cd module.tmp
+    if [ -d v11 ]
+    then
+        extras=`2>&1 jar cf $jarName -C v5 . --release 9 -C v9 . --release 11 -C v11 . | egrep Warning | sed -e "s/Warning: entry //" | sed -e "s/ contains.*$//"`
+    else
+        extras=`2>&1 jar cf $jarName -C v5 . --release 9 -C v9 . | egrep Warning | sed -e "s/Warning: entry //" | sed -e "s/ contains.*$//"`
+    fi
+    for f in `echo $extras`
+    do
+	p=`echo $f | sed -e "s:META-INF/versions/9::"`
+	rm v9/$p
+    done
+)
+sh ./bnd.sh build/artifacts/jdk1.5/jars/$jarName
+cp build/artifacts/jdk1.5/jars/$jarName module.tmp/$jarName
+# Java 11 Step
+(
+    export JAVA_HOME=$JAVA_11
+    export PATH=$JAVA_HOME/bin:$PATH 
+
+    cd module.tmp
+    jar uf $jarName --release 9 -C v9 .
+    if [ -d v11 ]
+    then
+        jar uf $jarName --release 11 -C v11 .
+    fi
+)
+# Java 15 Step
+(
+    export JAVA_HOME=$JAVA_15
+    export PATH=$JAVA_HOME/bin:$PATH 
+
+    cd module.tmp
+    if [ -d v15 ]
+    then
+        jar uf $jarName --release 15 -C v15 .
+    fi
+)
+cp module.tmp/$jarName build/artifacts/jdk1.5/jars/$jarName
+
+bcsign-oracle build/artifacts/jdk1.5/jars/$jarName
+done