Skip to content

Commit 2573f0a

Browse files
dghgitdghgit
committed
minor reformating - relates to gihub bcgit#1132 
1 parent b556325 commit 2573f0a

10 files changed

Lines changed: 278 additions & 224 deletions

File tree

‎CONTRIBUTORS.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@
511511
<li>Adam Vartanian &lt;https://github.com/flooey&gt; use of ShortBuffer exception and buffer size pre-check in Cipher.doFinal().</li>
512512
<li>Bernd &lt;https://github.com/ecki&gt; Fix to make PGPUtil.pipeFileContents use buffer and not leak file handle.</li>
513513
<li>Shartung &lt;https://github.com/shartung&gt; Additional EC Key Agreement algorithms in support of German BSI TR-03111.</li>
514-
<li>Paul Schaub &lt;https://github.com/vanitasvitae&gt; bringing PGPSecretKey.getUserIds() into line with PGPPublicKey.getUserIds(). Exception message fix in BcPublicKeyDataDecryptorFactory. Additional tests on PGP key ring generation. Improved functionality of PGPSignatureSubpacketGenerator, PGPPublicKeyRing. Tweaks to PGPDataEncryptorBuilder interface, fix for JcaPGP/BcPGP Ed25519 private key conversion. Added configurable CRC detection to ArmoredInputStream, additional control character skipping in ArmoredInputStream. Rewind code for PGPPBEEncryptedData, addition of PGPSignature.getDigestPrefix(). Wrong list traversal fix in PGPSecretKeyRing. Further improvement to use of generics in PGP API. General interop improvements. PGP Public / Secure keyring ignore marker packets when reading. Initial work on PGP session key handling, filtering literal data for canoncialization. Addition of direct key identified key-ring construction. PGPSecretKeyRing.insertOrReplacePublicKey addition. Addition of utility methods for joining/merging signatures and public keys. Addition of PGP regexp packet, PolicyURI packet handling, UTF8 comment testing. Efficiency improvements to TruncatedStream.</li>
514+
<li>Paul Schaub &lt;https://github.com/vanitasvitae&gt; bringing PGPSecretKey.getUserIds() into line with PGPPublicKey.getUserIds(). Exception message fix in BcPublicKeyDataDecryptorFactory. Additional tests on PGP key ring generation. Improved functionality of PGPSignatureSubpacketGenerator, PGPPublicKeyRing. Tweaks to PGPDataEncryptorBuilder interface, fix for JcaPGP/BcPGP Ed25519 private key conversion. Added configurable CRC detection to ArmoredInputStream, additional control character skipping in ArmoredInputStream. Rewind code for PGPPBEEncryptedData, addition of PGPSignature.getDigestPrefix(). Wrong list traversal fix in PGPSecretKeyRing. Further improvement to use of generics in PGP API. General interop improvements. PGP Public / Secure keyring ignore marker packets when reading. Initial work on PGP session key handling, filtering literal data for canoncialization. Addition of direct key identified key-ring construction. PGPSecretKeyRing.insertOrReplacePublicKey addition. Addition of utility methods for joining/merging signatures and public keys. Addition of PGP regexp packet, PolicyURI packet handling, UTF8 comment testing. Efficiency improvements to TruncatedStream. Initial Argon2 support for OpenPGP.</li>
515515
<li>Nick of Nexxar &lt;https://github.com/nros&gt; update to OpenPGP package to handle a broader range of EC curves.</li>
516516
<li>catbref &lt;https://github.com/catbref&gt; sample implementation of RFC 7748/Ed25519 (incorporated work from github users Valodim and str4d as well).</li>
517517
<li>gerlion &lt;https://github.com/gerlion&gt; detection of concurrency issue with pre-1.60 EC math library.</li>

‎docs/releasenotes.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ <h3>2.1.2 Defects Fixed</h3>
2929
<ul>
3030
<li>There were parameter errors in XMSS^MT OIDs for XMSSMT_SHA2_40/4_256 and XMSSMT_SHA2_60/3_256. These have been fixed.</li>
3131
<li>There was an error in Merkle tree construction for the Evidence Records (ERS) implementation which could result in invalid roots been timestamped. ERS now produces an ArchiveTimeStamp for each data object/group with an associated reduced hash tree.</li>
32+
<li>OpenPGP will now ignore signatures marked as non-exportable on encoding.</li>
3233
</ul>
3334
<h3>2.1.3 Additional Features and Functionality</h3>
3435
<ul>
@@ -40,6 +41,7 @@ <h3>2.1.3 Additional Features and Functionality</h3>
4041
<li>The SIKE Alternative Candidate NIST Post Quantum Algorithm has been added to the low-level API and the PQC provider.</li>
4142
<li>The NTRU Alternative Candidate NIST Post Quantum Algorithm has been added to the low-level API.</li>
4243
<li>The Falcon Finalist NIST Post Quantum Algorithm has been added to the low-level API.</li>
44+
<li>Argon2 Support has been added to the OpenPGP API.</li>
4345
</ul>
4446

4547
<a name="r1rv71"><h3>2.2.1 Version</h3></a>

‎pg/src/main/java/org/bouncycastle/bcpg/HashAlgorithmTags.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ public interface HashAlgorithmTags
2222

2323
public static final int MD4 = 301;
2424
public static final int SHA3_224 = 312; // SHA3-224
25+
public static final int SHA3_256_OLD = 313; //SHA3-256
2526
public static final int SHA3_384 = 314; // SHA3-384
27+
public static final int SHA3_512_OLD = 315; // SHA3-512
2628

27-
public static final int SM3 = 326; // SHA3-512
29+
30+
public static final int SM3 = 326; // SM3
2831

2932
}

0 commit comments

Comments
 (0)