merge from master

novotnyllc · Feb 7, 2019 · e4cd0bd · e4cd0bd
2 parents b0d14de + 18f1d45
commit e4cd0bd
Show file tree

Hide file tree

Showing 76 changed files with 1,562 additions and 1,701 deletions.
diff --git a/crypto/License.html b/crypto/License.html
@@ -9,7 +9,7 @@
 <h2>The Bouncy Castle Cryptographic C#&reg; API</h2>
 <h3>License:</h3>
 The Bouncy Castle License<br>
-Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc.
+Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc.
 (https://www.bouncycastle.org)<br>
 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

diff --git 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.4"/>
+  <property name="version" value="1.8.5"/>
   <property name="name" value="BouncyCastle.Crypto"/>
 
   <property name="OPTIONAL_STRONG_NAME" value="" />

diff --git a/crypto/Readme.html b/crypto/Readme.html
@@ -30,6 +30,8 @@ <h3><a class="mozTocH3" name="mozTocId685176"></a>Contents:<br/></h3>
 			<li>
 				<a href="#mozTocId3413">Notes:</a>
 		<ol>
+            <li>
+                <a href="#mozTocId85319">Release 1.8.5</a>
             <li>
                 <a href="#mozTocId85318">Release 1.8.4</a>
             <li>
@@ -296,11 +298,12 @@ <h3><a class="mozTocH3" name="mozTocId358608"></a>For first time users.</h3>
 		<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.5, 2019</h4>
+        <h4><a class="mozTocH4" name="mozTocId85319"></a>Release 1.8.5, Thursday January 31, 2019</h4>
+
         <h5>Additional Features and Functionality</h5>
         <ul>
-        <li>Supported added for encoding and decoding of GOST3410-2012 keys</li>
-        <li>Basic support added for CMP (RFC 4210) and CRMF (RFC 4211), including the PKI archive control.</li>
+            <li>Supported added for encoding and decoding of GOST3410-2012 keys</li>
+            <li>Basic support added for CMP (RFC 4210) and CRMF (RFC 4211), including the PKI archive control.</li>
         </ul>
 
         <h4><a class="mozTocH4" name="mozTocId85318"></a>Release 1.8.4, Saturday October 27, 2018</h4>