Merge SHA2 entries in FIPS table

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/205)

diff --git a/docs/OpenSSL300Design.md b/docs/OpenSSL300Design.md
index bafdf71ae5f0c4ac287e1cf48ad428335db58971..9246e446e088ad7262854d8121675b65070c5408 100644 (file)
--- a/docs/OpenSSL300Design.md
+++ b/docs/OpenSSL300Design.md
@@ -2910,17 +2910,7 @@ Security Policy statement regarding the <a href="https://csrc.nist.gov/publicati
    </td>
    <td><a href="http://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf">FIPS 180-4</a>
    </td>
-   <td>224, 256, 384, 512.
-   </td>
-  </tr>
-  <tr>
-   <td>
-   </td>
-   <td>SHA-2
-   </td>
-   <td><a href="http://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf">FIPS 180-4</a>
-   </td>
-   <td>512/224, 512/256.
+   <td>224, 256, 384, 512, 512/224, 512/256.
    </td>
   </tr>
   <tr>