From aeb4be5429fd241eefa0577cfc5f13f09f16c22c Mon Sep 17 00:00:00 2001
From: Peter Dettman <peter.dettman@bouncycastle.org>
Date: Sat, 27 Oct 2018 19:49:33 +0700
Subject: Update versions and release notes for 1.8.4

---
 crypto/NBuild.build        |  2 +-
 crypto/Readme.html         | 29 ++++++++++++++++++++++++-----
 crypto/src/AssemblyInfo.cs |  6 +++---
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/crypto/NBuild.build b/crypto/NBuild.build
index bbeb865a9..014cc57c6 100644
--- a/crypto/NBuild.build
+++ b/crypto/NBuild.build
@@ -16,7 +16,7 @@
   <property name="dist-path" value="./dist"/>
 
   <!-- Version -->
-  <property name="version" value="1.8.3"/>
+  <property name="version" value="1.8.4"/>
   <property name="name" value="BouncyCastle.Crypto"/>
 
   <property name="OPTIONAL_STRONG_NAME" value="" />
diff --git a/crypto/Readme.html b/crypto/Readme.html
index a89e7e535..d63974c66 100644
--- a/crypto/Readme.html
+++ b/crypto/Readme.html
@@ -119,7 +119,7 @@ We state, where EC MQV has not otherwise been disabled or removed:
             <li>
                 Symmetric key algorithms: AES, Blowfish, Camellia, CAST5, CAST6, ChaCha, DES, DESede,
                 GOST28147, HC-128, HC-256, IDEA, ISAAC, Noekeon, RC2, RC4, RC5-32, RC5-64, RC6, Rijndael,
-                Salsa20, SEED, Serpent, Skipjack, TEA/XTEA, Threefish, Tnepres, Twofish, VMPC and XSalsa20.
+                Salsa20, SEED, Serpent, Skipjack, SM4, TEA/XTEA, Threefish, Tnepres, Twofish, VMPC and XSalsa20.
             </li>
             <li>
                 Symmetric key modes: CBC, CFB, CTS, GOFB, OFB, OpenPGPCFB, and SIC (or CTR).
@@ -139,16 +139,16 @@ We state, where EC MQV has not otherwise been disabled or removed:
             </li>
             <li>
                 Digests: GOST3411, Keccak, MD2, MD4, MD5, RIPEMD128, RIPEMD160, RIPEMD256, RIPEMD320,
-                SHA-1, SHA-224, SHA-256, SHA-384, SHA-512, SHA3, Tiger, and Whirlpool.
+                SHA-1, SHA-224, SHA-256, SHA-384, SHA-512, SHA3, SM3, Tiger, and Whirlpool.
             </li>
             <li>
                 XOFs: SHAKE.
             </li>
             <li>
-                Signer mechanisms: DSA, ECDSA, ECGOST3410, ECNR, GOST3410, ISO9796d2, PSS, RSA, X9.31-1998.
+                Signer mechanisms: DSA, ECDSA, ECGOST3410, ECNR, Ed25519, Ed448, GOST3410, ISO9796d2, PSS, RSA, X9.31-1998.
             </li>
             <li>
-                Key Agreement: Diffie-Hellman, EC-DH, EC-MQV, J-PAKE, SRP-6a.
+                Key Agreement: Diffie-Hellman, EC-DH, EC-MQV, J-PAKE, SRP-6a, X25519, X448.
             </li>
             <li>
                 Macs: CBCBlockCipher, CFBBlockCipher, CMAC, GMAC, GOST28147, HMac, ISO9797 Alg. 3, Poly1305, SipHash, SkeinMac, VMPCMAC.
@@ -296,8 +296,16 @@ We state, where EC MQV has not otherwise been disabled or removed:
 		<hr style="WIDTH: 100%; HEIGHT: 2px">
 		<h3><a class="mozTocH3" name="mozTocId3413"></a>Notes:</h3>
 
-        <h4><a class="mozTocH4" name="mozTocId85318"></a>Release 1.8.4, TBD</h4>
+        <h4><a class="mozTocH4" name="mozTocId85318"></a>Release 1.8.4, Saturday October 27, 2018</h4>
 
+        <h5>IMPORTANT</h5>
+        <ul>
+            <li>
+                This is the final feature release with support for legacy .NET platforms. From 1.9.0 we will be targeting more
+                modern .NET frameworks (see https://github.com/bcgit/bc-csharp/pull/68) and updating our build and packaging systems.
+                The 1.8.x series will continue to receive bug fixes, but limited new functionality.
+            </li>
+        </ul>
         <h5>Defects Fixed</h5>
         <ul>
             <li>Rfc3211WrapEngine would not properly handle messages longer than 127 bytes. This has been fixed.</li>
@@ -305,6 +313,17 @@ We state, where EC MQV has not otherwise been disabled or removed:
         <h5>Additional Features and Functionality</h5>
         <ul>
             <li>Restrictions on the output sizes of the Blake2b/s digests have been removed.</li>
+            <li>RFC 7748: Higher-level support for X25519 and X448 has been added.</li>
+            <li>RFC 8032: Higher-level support for Ed25519 and Ed448 has been added.</li>
+            <li>Implementation of the SM4 block cipher has been added.</li>
+            <li>Added support for Plain ECDSA (a.k.a CVC-ECDSA).</li>
+        </ul>
+        <h5>Additional Notes</h5>
+        <ul>
+            <li>
+                See the (cumulative) list of GitHub pull requests that we have accepted at
+                <a href="https://github.com/bcgit/bc-csharp/pulls?q=is%3Apr+is%3Aclosed">bcgit/bc-csharp</a>.
+            </li>
         </ul>
 
         <h4><a class="mozTocH4" name="mozTocId85317"></a>Release 1.8.3, Saturday August 11, 2018</h4>
diff --git a/crypto/src/AssemblyInfo.cs b/crypto/src/AssemblyInfo.cs
index 5cc8fcd2f..2b92e07f3 100644
--- a/crypto/src/AssemblyInfo.cs
+++ b/crypto/src/AssemblyInfo.cs
@@ -33,9 +33,9 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.8.3.0")]
-[assembly: AssemblyFileVersion("1.8.18223.1")]
-[assembly: AssemblyInformationalVersion("1.8.3")]
+[assembly: AssemblyVersion("1.8.4.0")]
+[assembly: AssemblyFileVersion("1.8.18300.1")]
+[assembly: AssemblyInformationalVersion("1.8.4")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the
-- 
cgit 1.5.1