Update bouncycastle from 1.65 to 1.69
CQ: 23471
CQ: 23472
CQ: 23473
CQ: 23474
Bug: 574234
Change-Id: I1529088e99c846fc746aef50d62a60e03f6575fe
diff --git a/bouncycastle/org.bouncycastle.bcpg_1.65.0/osgi.bnd b/bouncycastle/org.bouncycastle.bcpg_1.65.0/osgi.bnd
deleted file mode 100644
index 3271715..0000000
--- a/bouncycastle/org.bouncycastle.bcpg_1.65.0/osgi.bnd
+++ /dev/null
@@ -1,15 +0,0 @@
-package-version=${version;===;${Bundle-Version}}
-bcprov-jdk15on-version-range=${range;[===,=+);1.65}
-
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: \
- !about.html,!about_files, \
- *.internal*;x-internal:=true;version="${package-version}", \
- *.impl*;x-internal:=true;version="${package-version}", \
- *;version="${package-version}"
-
-Import-Package: \
- org.bouncycastle*;version="${bcprov-jdk15on-version-range}", \
- *;resolution:=optional
-
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.5))"
\ No newline at end of file
diff --git a/bouncycastle/org.bouncycastle.bcpg_1.65.0/src/eclipse/ip_log.xml b/bouncycastle/org.bouncycastle.bcpg_1.65.0/src/eclipse/ip_log.xml
deleted file mode 100644
index 83d6bd8..0000000
--- a/bouncycastle/org.bouncycastle.bcpg_1.65.0/src/eclipse/ip_log.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ip_log version="1.0">
- <project id="org.bouncycastle.bcpg" version="1.65.0" status="done">
- <info>
- <name>Bouncy Castle OpenPGP API</name>
- <repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
- <location>bouncycastle/org.bouncycastle.bcpg</location>
- </info>
- <contact>
- <name>Tony Homer</name>
- <email>tony.homer@intel.com</email>
- <company>Intel Corporation</company>
- </contact>
- <legal>
- <ipzilla bug_id="21975"/>
- <license>
- <name>MIT License</name>
- <reference>http://www.bouncycastle.org/licence.html</reference>
- </license>
- <package>bcpg-jdk15on-1.65.jar</package>
- </legal>
- </project>
-</ip_log>
diff --git a/bouncycastle/org.bouncycastle.bcpg_1.65.0/.project b/bouncycastle/org.bouncycastle.bcpg_1.69.0/.project
similarity index 80%
rename from bouncycastle/org.bouncycastle.bcpg_1.65.0/.project
rename to bouncycastle/org.bouncycastle.bcpg_1.69.0/.project
index 5eb5c62..533c472 100644
--- a/bouncycastle/org.bouncycastle.bcpg_1.65.0/.project
+++ b/bouncycastle/org.bouncycastle.bcpg_1.69.0/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.bouncycastle.bcpg_1.65.0</name>
+ <name>org.bouncycastle.bcpg_1.69.0</name>
<comment></comment>
<projects>
</projects>
diff --git a/bouncycastle/org.bouncycastle.bcpg_1.69.0/osgi.bnd b/bouncycastle/org.bouncycastle.bcpg_1.69.0/osgi.bnd
new file mode 100644
index 0000000..9513ff1
--- /dev/null
+++ b/bouncycastle/org.bouncycastle.bcpg_1.69.0/osgi.bnd
@@ -0,0 +1,15 @@
+package-version=${version;===;${Bundle-Version}}
+bcprov-jdk15on-version-range=${range;[===,=+);1.69}
+
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: \
+ !about.html,!about_files, \
+ *.internal*;x-internal:=true;version="${package-version}";-noimport:=true, \
+ *.impl*;x-internal:=true;version="${package-version}";-noimport:=true, \
+ *;version="${package-version}";-noimport:=true
+
+Import-Package: \
+ org.bouncycastle*;version="${bcprov-jdk15on-version-range}", \
+ *;resolution:=optional
+
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.5))"
\ No newline at end of file
diff --git a/bouncycastle/org.bouncycastle.bcpg_1.65.0/pom.xml b/bouncycastle/org.bouncycastle.bcpg_1.69.0/pom.xml
similarity index 92%
rename from bouncycastle/org.bouncycastle.bcpg_1.65.0/pom.xml
rename to bouncycastle/org.bouncycastle.bcpg_1.69.0/pom.xml
index bdd3ac0..15d067c 100644
--- a/bouncycastle/org.bouncycastle.bcpg_1.65.0/pom.xml
+++ b/bouncycastle/org.bouncycastle.bcpg_1.69.0/pom.xml
@@ -8,7 +8,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.bouncycastle.bcpg</artifactId>
- <version>1.65.0-SNAPSHOT</version>
+ <version>1.69.0-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>Bouncy Castle OpenPGP API</name>
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk15on</artifactId>
- <version>1.65</version>
+ <version>1.69</version>
</dependency>
</dependencies>
</project>
diff --git a/bouncycastle/org.bouncycastle.bcprov_1.65.01/src/eclipse/ip_log.xml b/bouncycastle/org.bouncycastle.bcpg_1.69.0/src/eclipse/ip_log.xml
similarity index 65%
copy from bouncycastle/org.bouncycastle.bcprov_1.65.01/src/eclipse/ip_log.xml
copy to bouncycastle/org.bouncycastle.bcpg_1.69.0/src/eclipse/ip_log.xml
index e5694f5..5a7d48a 100644
--- a/bouncycastle/org.bouncycastle.bcprov_1.65.01/src/eclipse/ip_log.xml
+++ b/bouncycastle/org.bouncycastle.bcpg_1.69.0/src/eclipse/ip_log.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.bouncycastle.bcprov" version="1.65.1" status="done">
+ <project id="org.bouncycastle.bcpg" version="1.69.0" status="done">
<info>
- <name>Bouncy Castle Provider</name>
+ <name>Bouncy Castle OpenPGP API</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
- <location>bouncycastle/org.bouncycastle.bcprov</location>
+ <location>bouncycastle/org.bouncycastle.bcpg</location>
</info>
<contact>
<name>Matthias Sohn</name>
@@ -12,12 +12,12 @@
<company>SAP SE</company>
</contact>
<legal>
- <ipzilla bug_id="21977"/>
+ <ipzilla bug_id="23472"/>
<license>
<name>MIT License</name>
<reference>http://www.bouncycastle.org/licence.html</reference>
</license>
- <package>bcprov-jdk15on-1.65.01.jar</package>
+ <package>bcpg-jdk15on-1.69.jar</package>
</legal>
</project>
</ip_log>
diff --git a/bouncycastle/org.bouncycastle.bcpg_1.65.0/src/main/resources/OSGI-INF/l10n/bundle.properties b/bouncycastle/org.bouncycastle.bcpg_1.69.0/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from bouncycastle/org.bouncycastle.bcpg_1.65.0/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to bouncycastle/org.bouncycastle.bcpg_1.69.0/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/bouncycastle/org.bouncycastle.bcpg_1.65.0/src/main/resources/about.html b/bouncycastle/org.bouncycastle.bcpg_1.69.0/src/main/resources/about.html
similarity index 100%
rename from bouncycastle/org.bouncycastle.bcpg_1.65.0/src/main/resources/about.html
rename to bouncycastle/org.bouncycastle.bcpg_1.69.0/src/main/resources/about.html
diff --git a/bouncycastle/org.bouncycastle.bcpg_1.65.0/src/main/resources/about_files/APACHE_SOFTWARE_LICENSE__VERSION_1.1.txt b/bouncycastle/org.bouncycastle.bcpg_1.69.0/src/main/resources/about_files/APACHE_SOFTWARE_LICENSE__VERSION_1.1.txt
similarity index 100%
rename from bouncycastle/org.bouncycastle.bcpg_1.65.0/src/main/resources/about_files/APACHE_SOFTWARE_LICENSE__VERSION_1.1.txt
rename to bouncycastle/org.bouncycastle.bcpg_1.69.0/src/main/resources/about_files/APACHE_SOFTWARE_LICENSE__VERSION_1.1.txt
diff --git a/bouncycastle/org.bouncycastle.bcpg_1.65.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html b/bouncycastle/org.bouncycastle.bcpg_1.69.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html
similarity index 100%
rename from bouncycastle/org.bouncycastle.bcpg_1.65.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html
rename to bouncycastle/org.bouncycastle.bcpg_1.69.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html
diff --git a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/osgi.bnd b/bouncycastle/org.bouncycastle.bcpkix_1.65.0/osgi.bnd
deleted file mode 100644
index 3271715..0000000
--- a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/osgi.bnd
+++ /dev/null
@@ -1,15 +0,0 @@
-package-version=${version;===;${Bundle-Version}}
-bcprov-jdk15on-version-range=${range;[===,=+);1.65}
-
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: \
- !about.html,!about_files, \
- *.internal*;x-internal:=true;version="${package-version}", \
- *.impl*;x-internal:=true;version="${package-version}", \
- *;version="${package-version}"
-
-Import-Package: \
- org.bouncycastle*;version="${bcprov-jdk15on-version-range}", \
- *;resolution:=optional
-
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.5))"
\ No newline at end of file
diff --git a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/.project b/bouncycastle/org.bouncycastle.bcpkix_1.69.0/.project
similarity index 79%
copy from bouncycastle/org.bouncycastle.bcpkix_1.65.0/.project
copy to bouncycastle/org.bouncycastle.bcpkix_1.69.0/.project
index a1d50d7..69fb281 100644
--- a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/.project
+++ b/bouncycastle/org.bouncycastle.bcpkix_1.69.0/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.bouncycastle.bcpkix_1.65.0</name>
+ <name>org.bouncycastle.bcpkix_1.69.0</name>
<comment></comment>
<projects>
</projects>
diff --git a/bouncycastle/org.bouncycastle.bcpkix_1.69.0/osgi.bnd b/bouncycastle/org.bouncycastle.bcpkix_1.69.0/osgi.bnd
new file mode 100644
index 0000000..9513ff1
--- /dev/null
+++ b/bouncycastle/org.bouncycastle.bcpkix_1.69.0/osgi.bnd
@@ -0,0 +1,15 @@
+package-version=${version;===;${Bundle-Version}}
+bcprov-jdk15on-version-range=${range;[===,=+);1.69}
+
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: \
+ !about.html,!about_files, \
+ *.internal*;x-internal:=true;version="${package-version}";-noimport:=true, \
+ *.impl*;x-internal:=true;version="${package-version}";-noimport:=true, \
+ *;version="${package-version}";-noimport:=true
+
+Import-Package: \
+ org.bouncycastle*;version="${bcprov-jdk15on-version-range}", \
+ *;resolution:=optional
+
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.5))"
\ No newline at end of file
diff --git a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/pom.xml b/bouncycastle/org.bouncycastle.bcpkix_1.69.0/pom.xml
similarity index 93%
rename from bouncycastle/org.bouncycastle.bcpkix_1.65.0/pom.xml
rename to bouncycastle/org.bouncycastle.bcpkix_1.69.0/pom.xml
index ff09dfa..33cb3be 100644
--- a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/pom.xml
+++ b/bouncycastle/org.bouncycastle.bcpkix_1.69.0/pom.xml
@@ -8,7 +8,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.bouncycastle.bcpkix</artifactId>
- <version>1.65.0-SNAPSHOT</version>
+ <version>1.69.0-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs</name>
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.65</version>
+ <version>1.69</version>
</dependency>
</dependencies>
</project>
diff --git a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/src/eclipse/ip_log.xml b/bouncycastle/org.bouncycastle.bcpkix_1.69.0/src/eclipse/ip_log.xml
similarity index 67%
rename from bouncycastle/org.bouncycastle.bcpkix_1.65.0/src/eclipse/ip_log.xml
rename to bouncycastle/org.bouncycastle.bcpkix_1.69.0/src/eclipse/ip_log.xml
index 3a5373c..9997734 100644
--- a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/src/eclipse/ip_log.xml
+++ b/bouncycastle/org.bouncycastle.bcpkix_1.69.0/src/eclipse/ip_log.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.bouncycastle.bcpkix" version="1.65.0" status="done">
+ <project id="org.bouncycastle.bcpkix" version="1.69.0" status="done">
<info>
<name>Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
<location>bouncycastle/org.bouncycastle.bcpkix</location>
</info>
<contact>
- <name>Tony Homer</name>
- <email>tony.homer@intel.com</email>
- <company>Intel Corporation</company>
+ <name>Matthias Sohn</name>
+ <email>matthias.sohn@sap.com</email>
+ <company>SAP SE</company>
</contact>
<legal>
- <ipzilla bug_id="21976"/>
+ <ipzilla bug_id="23473"/>
<license>
<name>MIT License</name>
<reference>http://www.bouncycastle.org/licence.html</reference>
</license>
- <package>bcpkix-jdk15on-1.65.jar</package>
+ <package>bcpkix-jdk15on-1.69.jar</package>
</legal>
</project>
</ip_log>
diff --git a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/src/main/resources/OSGI-INF/l10n/bundle.properties b/bouncycastle/org.bouncycastle.bcpkix_1.69.0/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from bouncycastle/org.bouncycastle.bcpkix_1.65.0/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to bouncycastle/org.bouncycastle.bcpkix_1.69.0/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/src/main/resources/about.html b/bouncycastle/org.bouncycastle.bcpkix_1.69.0/src/main/resources/about.html
similarity index 100%
rename from bouncycastle/org.bouncycastle.bcpkix_1.65.0/src/main/resources/about.html
rename to bouncycastle/org.bouncycastle.bcpkix_1.69.0/src/main/resources/about.html
diff --git a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html b/bouncycastle/org.bouncycastle.bcpkix_1.69.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html
similarity index 100%
rename from bouncycastle/org.bouncycastle.bcpkix_1.65.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html
rename to bouncycastle/org.bouncycastle.bcpkix_1.69.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html
diff --git a/bouncycastle/org.bouncycastle.bcprov_1.65.01/.project b/bouncycastle/org.bouncycastle.bcprov_1.69.0/.project
similarity index 91%
rename from bouncycastle/org.bouncycastle.bcprov_1.65.01/.project
rename to bouncycastle/org.bouncycastle.bcprov_1.69.0/.project
index 95a007f..f66d30f 100644
--- a/bouncycastle/org.bouncycastle.bcprov_1.65.01/.project
+++ b/bouncycastle/org.bouncycastle.bcprov_1.69.0/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.bouncycastle.bcprov_1.65.01</name>
+ <name>org.bouncycastle.bcprov_1.69.0</name>
<comment></comment>
<projects>
</projects>
diff --git a/bouncycastle/org.bouncycastle.bcprov_1.65.01/osgi.bnd b/bouncycastle/org.bouncycastle.bcprov_1.69.0/osgi.bnd
similarity index 74%
rename from bouncycastle/org.bouncycastle.bcprov_1.65.01/osgi.bnd
rename to bouncycastle/org.bouncycastle.bcprov_1.69.0/osgi.bnd
index 9d7f447..a9055c2 100644
--- a/bouncycastle/org.bouncycastle.bcprov_1.65.01/osgi.bnd
+++ b/bouncycastle/org.bouncycastle.bcprov_1.69.0/osgi.bnd
@@ -9,9 +9,9 @@
!org/bouncycastle/pqc/math/ntru/polynomial/test, \
!org/bouncycastle/pqc/math/ntru/util/test, \
!org/bouncycastle/util/test, \
- *.internal*;x-internal:=true;version="${package-version}", \
- *.impl*;x-internal:=true;version="${package-version}", \
- *;version="${package-version}"
+ *.internal*;x-internal:=true;version="${package-version}";-noimport:=true, \
+ *.impl*;x-internal:=true;version="${package-version}";-noimport:=true, \
+ *;version="${package-version}";-noimport:=true
Import-Package: \
org.bouncycastle.*;version="${range;[==,=+);${package-version}}", \
diff --git a/bouncycastle/org.bouncycastle.bcprov_1.65.01/pom.xml b/bouncycastle/org.bouncycastle.bcprov_1.69.0/pom.xml
similarity index 96%
rename from bouncycastle/org.bouncycastle.bcprov_1.65.01/pom.xml
rename to bouncycastle/org.bouncycastle.bcprov_1.69.0/pom.xml
index ee170e1..cf2b7cc 100644
--- a/bouncycastle/org.bouncycastle.bcprov_1.65.01/pom.xml
+++ b/bouncycastle/org.bouncycastle.bcprov_1.69.0/pom.xml
@@ -8,7 +8,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.bouncycastle.bcprov</artifactId>
- <version>1.65.01-SNAPSHOT</version>
+ <version>1.69.0-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>Bouncy Castle Provider</name>
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.65.01</version>
+ <version>1.69</version>
</dependency>
</dependencies>
</project>
diff --git a/bouncycastle/org.bouncycastle.bcprov_1.65.01/src/eclipse/ip_log.xml b/bouncycastle/org.bouncycastle.bcprov_1.69.0/src/eclipse/ip_log.xml
similarity index 80%
rename from bouncycastle/org.bouncycastle.bcprov_1.65.01/src/eclipse/ip_log.xml
rename to bouncycastle/org.bouncycastle.bcprov_1.69.0/src/eclipse/ip_log.xml
index e5694f5..d8b3fb2 100644
--- a/bouncycastle/org.bouncycastle.bcprov_1.65.01/src/eclipse/ip_log.xml
+++ b/bouncycastle/org.bouncycastle.bcprov_1.69.0/src/eclipse/ip_log.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.bouncycastle.bcprov" version="1.65.1" status="done">
+ <project id="org.bouncycastle.bcprov" version="1.69.0" status="done">
<info>
<name>Bouncy Castle Provider</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
@@ -12,12 +12,12 @@
<company>SAP SE</company>
</contact>
<legal>
- <ipzilla bug_id="21977"/>
+ <ipzilla bug_id="23471"/>
<license>
<name>MIT License</name>
<reference>http://www.bouncycastle.org/licence.html</reference>
</license>
- <package>bcprov-jdk15on-1.65.01.jar</package>
+ <package>bcprov-jdk15on-1.69.jar</package>
</legal>
</project>
</ip_log>
diff --git a/bouncycastle/org.bouncycastle.bcprov_1.65.01/src/main/resources/OSGI-INF/l10n/bundle.properties b/bouncycastle/org.bouncycastle.bcprov_1.69.0/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from bouncycastle/org.bouncycastle.bcprov_1.65.01/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to bouncycastle/org.bouncycastle.bcprov_1.69.0/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/bouncycastle/org.bouncycastle.bcprov_1.65.01/src/main/resources/about.html b/bouncycastle/org.bouncycastle.bcprov_1.69.0/src/main/resources/about.html
similarity index 100%
rename from bouncycastle/org.bouncycastle.bcprov_1.65.01/src/main/resources/about.html
rename to bouncycastle/org.bouncycastle.bcprov_1.69.0/src/main/resources/about.html
diff --git a/bouncycastle/org.bouncycastle.bcprov_1.65.01/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html b/bouncycastle/org.bouncycastle.bcprov_1.69.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html
similarity index 100%
rename from bouncycastle/org.bouncycastle.bcprov_1.65.01/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html
rename to bouncycastle/org.bouncycastle.bcprov_1.69.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html
diff --git a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/.project b/bouncycastle/org.bouncycastle.bcutil_1.69.0/.project
similarity index 79%
rename from bouncycastle/org.bouncycastle.bcpkix_1.65.0/.project
rename to bouncycastle/org.bouncycastle.bcutil_1.69.0/.project
index a1d50d7..d896d33 100644
--- a/bouncycastle/org.bouncycastle.bcpkix_1.65.0/.project
+++ b/bouncycastle/org.bouncycastle.bcutil_1.69.0/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.bouncycastle.bcpkix_1.65.0</name>
+ <name>org.bouncycastle.bcutil_1.69.0</name>
<comment></comment>
<projects>
</projects>
diff --git a/bouncycastle/org.bouncycastle.bcutil_1.69.0/osgi.bnd b/bouncycastle/org.bouncycastle.bcutil_1.69.0/osgi.bnd
new file mode 100644
index 0000000..9513ff1
--- /dev/null
+++ b/bouncycastle/org.bouncycastle.bcutil_1.69.0/osgi.bnd
@@ -0,0 +1,15 @@
+package-version=${version;===;${Bundle-Version}}
+bcprov-jdk15on-version-range=${range;[===,=+);1.69}
+
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: \
+ !about.html,!about_files, \
+ *.internal*;x-internal:=true;version="${package-version}";-noimport:=true, \
+ *.impl*;x-internal:=true;version="${package-version}";-noimport:=true, \
+ *;version="${package-version}";-noimport:=true
+
+Import-Package: \
+ org.bouncycastle*;version="${bcprov-jdk15on-version-range}", \
+ *;resolution:=optional
+
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.5))"
\ No newline at end of file
diff --git a/bouncycastle/org.bouncycastle.bcpg_1.65.0/pom.xml b/bouncycastle/org.bouncycastle.bcutil_1.69.0/pom.xml
similarity index 68%
copy from bouncycastle/org.bouncycastle.bcpg_1.65.0/pom.xml
copy to bouncycastle/org.bouncycastle.bcutil_1.69.0/pom.xml
index bdd3ac0..d730e3e 100644
--- a/bouncycastle/org.bouncycastle.bcpg_1.65.0/pom.xml
+++ b/bouncycastle/org.bouncycastle.bcutil_1.69.0/pom.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -7,10 +7,10 @@
<artifactId>bouncycastle</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.bouncycastle.bcpg</artifactId>
- <version>1.65.0-SNAPSHOT</version>
+ <artifactId>org.bouncycastle.bcutil</artifactId>
+ <version>1.69.0-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
- <name>Bouncy Castle OpenPGP API</name>
+ <name>Bouncy Castle ASN.1 Extension and Utility APIs</name>
<properties>
<recipe.excludes>
@@ -22,8 +22,8 @@
<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk15on</artifactId>
- <version>1.65</version>
+ <artifactId>bcutil-jdk15on</artifactId>
+ <version>1.69</version>
</dependency>
</dependencies>
</project>
diff --git a/bouncycastle/org.bouncycastle.bcprov_1.65.01/src/eclipse/ip_log.xml b/bouncycastle/org.bouncycastle.bcutil_1.69.0/src/eclipse/ip_log.xml
similarity index 64%
copy from bouncycastle/org.bouncycastle.bcprov_1.65.01/src/eclipse/ip_log.xml
copy to bouncycastle/org.bouncycastle.bcutil_1.69.0/src/eclipse/ip_log.xml
index e5694f5..043e8a3 100644
--- a/bouncycastle/org.bouncycastle.bcprov_1.65.01/src/eclipse/ip_log.xml
+++ b/bouncycastle/org.bouncycastle.bcutil_1.69.0/src/eclipse/ip_log.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.bouncycastle.bcprov" version="1.65.1" status="done">
+ <project id="org.bouncycastle.bcutil" version="1.69.0" status="done">
<info>
- <name>Bouncy Castle Provider</name>
+ <name>Bouncy Castle ASN.1 Extension and Utility APIs</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
- <location>bouncycastle/org.bouncycastle.bcprov</location>
+ <location>bouncycastle/org.bouncycastle.bcutil</location>
</info>
<contact>
<name>Matthias Sohn</name>
@@ -12,12 +12,12 @@
<company>SAP SE</company>
</contact>
<legal>
- <ipzilla bug_id="21977"/>
+ <ipzilla bug_id="23474"/>
<license>
<name>MIT License</name>
<reference>http://www.bouncycastle.org/licence.html</reference>
</license>
- <package>bcprov-jdk15on-1.65.01.jar</package>
+ <package>bcutil-jdk15on-1.69.jar</package>
</legal>
</project>
-</ip_log>
+</ip_log>
\ No newline at end of file
diff --git a/bouncycastle/org.bouncycastle.bcutil_1.69.0/src/main/resources/OSGI-INF/l10n/bundle.properties b/bouncycastle/org.bouncycastle.bcutil_1.69.0/src/main/resources/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..8a449c0
--- /dev/null
+++ b/bouncycastle/org.bouncycastle.bcutil_1.69.0/src/main/resources/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+# Bundle Localization
+bundleName = Bouncy Castle ASN.1 Extension and Utility APIs
+bundleVendor = Eclipse Orbit
diff --git a/bouncycastle/org.bouncycastle.bcutil_1.69.0/src/main/resources/about.html b/bouncycastle/org.bouncycastle.bcutil_1.69.0/src/main/resources/about.html
new file mode 100644
index 0000000..23e769f
--- /dev/null
+++ b/bouncycastle/org.bouncycastle.bcutil_1.69.0/src/main/resources/about.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 16, 2021</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+<h3>Third Party Content</h3>
+<p>The Content includes items that have been sourced from third parties as set out below. If you
+did not receive this Content directly from the Eclipse Foundation, the following is provided
+for informational purposes only, and you should look to the Redistributor's license for
+terms and conditions of use.</p>
+
+<h4>Bouncy Castle ASN.1 Extension and Utility APIs</h4>
+
+<p>The plug-in includes software developed by The Legion of the Bouncy Castle Inc. <feedback-crypto@bouncycastle.org> as part of the Bouncy Castle ASN.1 Extension and Utility APIs project.</p>
+
+<p>Bouncy Castle ASN.1 Extension and Utility APIs is provided to you under the terms and conditions of the <a href="https://www.bouncycastle.org/licence.html" target="_blank">Bouncy Castle Licence</a> (<a href="about_files/BOUNCY_CASTLE_LICENCE.html" target="_blank">BOUNCY_CASTLE_LICENCE.html</a>) license.</p>
+
+<p>Bouncy Castle ASN.1 Extension and Utility APIs including its source is available from <a href="https://www.bouncycastle.org/java.html" target="_blank">www.bouncycastle.org/java.html</a>. Bugs or feature requests can be made in the project issue tracking system at <a href="https://github.com/bcgit/bc-java/issues" target="_blank">github.com/bcgit/bc-java/issues</a>.</p>
+
+
+</body>
+</html>
diff --git a/bouncycastle/org.bouncycastle.bcutil_1.69.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html b/bouncycastle/org.bouncycastle.bcutil_1.69.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html
new file mode 100644
index 0000000..fe16dc4
--- /dev/null
+++ b/bouncycastle/org.bouncycastle.bcutil_1.69.0/src/main/resources/about_files/BOUNCY_CASTLE_LICENCE.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>bouncycastle.org</title>
+ <meta http-equiv="Content-type" content="text/html; charset=iso-8859-1" />
+ <meta http-equiv="Content-Language" content="en-aus" />
+ <meta name="description" content="Home of the Legion of the Bouncy Castle and their Java cryptography resources and open source code" />
+ <meta name="keywords" content="Legion of the Bouncy Castle, Cryptography, JCE, Java Cryptography Extension, Cryptography Source Code, ASN.1, X.509, Open Source" />
+ <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
+ <link rel="stylesheet" type="text/css" href="bouncycastle.css" />
+</head>
+<body>
+
+
+<div id="header">
+ <div id="title">
+ <h1>The Legion of the Bouncy Castle</h1>
+ </div>
+</div>
+
+
+<div id="container">
+
+ <div id="content">
+
+ <div id="navigation">
+ <ul>
+ <li><a href="index.html" class="nav">entry</a></li>
+ <li><a href="https://www.bouncycastle.org/donate/index.cgi" class="nav">donate</a></li>
+ <li><a href="mailing_lists.html" class="nav">mailing lists</a></li>
+ <li><a href="latest_releases.html" class="nav">latest releases</a></li>
+ <li><a href="documentation.html" class="nav">documentation</a></li>
+ <li><a href="resources.html" class="nav">resources</a></li>
+ <li><a href="mirrors.html" class="nav">mirroring</a></li>
+ <li><div style="color:#0000FF;font-weight:bold;">legal and licencing</div></li>
+ <li><a href="contributors.html" class="nav">contributors</a></li>
+ <li><a href="csharp" class="nav">c#</a></li>
+ </ul>
+ <div class="clearing"> </div>
+ </div>
+
+
+ <div id="body">
+
+ <p>Please note this should be read in the same way as the <a href="http://opensource.org/licenses/MIT">MIT license</a>.</p>
+ <p>Please also note this licensing model is made possible through funding from <a href="https://www.bouncycastle.org/donate">donations</a> and the sale of <a href="https://www.cryptoworkshop.com/support_faq.html">support contracts</a>.</p>
+ <h2 class="spot">License</h2>
+ <p>Copyright (c) 2000 - 2021 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.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, 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:
+ <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ <p>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.
+
+
+ </div>
+ <div class="clearing"> </div>
+
+ </div>
+</div>
+<div class="clearing"> </div>
+
+
+<div id="footer">
+ <ul>
+ <li>Site hosted by <a href="http://www.tauceti.org.au/">Tau Ceti Co-operative Ltd</a>.</li>
+ <li>Graphics provided by <a href="http://www.geoffhook.com/">Geoff Hook</a>.</li>
+ <li>Layout and design by <a href="http://www.prozacblues.com/">Travis Winters</a>.</li>
+ <li>Java and JCE are registered trademarks of <a href="http://www.java.com/">Oracle</a> ®.</li>
+ </ul>
+</div>
+
+</body>
+</html>
diff --git a/bouncycastle/pom.xml b/bouncycastle/pom.xml
index 1d1a8cb..7b8fc77 100644
--- a/bouncycastle/pom.xml
+++ b/bouncycastle/pom.xml
@@ -24,9 +24,10 @@
</properties>
<modules>
- <module>org.bouncycastle.bcpg_1.65.0</module>
- <module>org.bouncycastle.bcpkix_1.65.0</module>
- <module>org.bouncycastle.bcprov_1.65.01</module>
+ <module>org.bouncycastle.bcpg_1.69.0</module>
+ <module>org.bouncycastle.bcpkix_1.69.0</module>
+ <module>org.bouncycastle.bcprov_1.69.0</module>
+ <module>org.bouncycastle.bcutil_1.69.0</module>
</modules>
</project>
diff --git a/releng/aggregationfeature/feature.xml b/releng/aggregationfeature/feature.xml
index f2eda9e..82f96e2 100644
--- a/releng/aggregationfeature/feature.xml
+++ b/releng/aggregationfeature/feature.xml
@@ -242,9 +242,10 @@
<plugin id="org.apache.ws.commons.util" version="1.0.2.qualifier"/>
<plugin id="org.apache.wsil4j" version="1.0.0.qualifier"/>
- <plugin id="org.bouncycastle.bcpg" version="1.65.0.qualifier"/>
- <plugin id="org.bouncycastle.bcpkix" version="1.65.0.qualifier"/>
- <plugin id="org.bouncycastle.bcprov" version="1.65.01.qualifier"/>
+ <plugin id="org.bouncycastle.bcpg" version="1.69.0.qualifier"/>
+ <plugin id="org.bouncycastle.bcpkix" version="1.69.0.qualifier"/>
+ <plugin id="org.bouncycastle.bcprov" version="1.69.0.qualifier"/>
+ <plugin id="org.bouncycastle.bcutil" version="1.69.0.qualifier"/>
<plugin id="org.eclipse.orbit.mongodb" version="3.2.2.qualifier"/>
