Skip to content

Commit ef676b6

Browse files
dghgitdghgit
committed
update
1 parent 6e879c3 commit ef676b6

1 file changed

Lines changed: 87 additions & 66 deletions

File tree

‎docs/specifications.html‎

Lines changed: 87 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ <h4>MAC</h4>
328328
<tr><td><b>VMPCMac</b></td><td>160 bits</td><td>&nbsp;</td></tr>
329329
</table>
330330

331-
<h4>PBE</h4>
331+
<h4>PBE and Password Hashing</h4>
332332

333333
<p>
334334
The base class is <b>PBEParametersGenerator</b> and has the following
@@ -341,6 +341,15 @@ <h4>PBE</h4>
341341
<tr><td><b>PKCS12ParametersGenerator</b></td><td>Digest</td><td>&nbsp;</td></tr>
342342
<tr><td><b>OpenSSLPBEParametersGenerator</b></td><td>&nbsp;</td><td>Uses MD5 as defined</td></tr>
343343
</table>
344+
<p>
345+
The following password hashing schemes are supported:
346+
</p>
347+
<table cellpadding=5 cellspacing=0 border=1 width=80%>
348+
<tr><th>Name</th><th>Constructor</th><th>Notes</th></tr>
349+
<tr><td><b>BCrypt</b></td><td>&nbsp;</td><td>&nbsp;</td></tr>
350+
<tr><td><b>OpenBSDBcyrpt</b></td><td>&nbsp;</td><td>&nbsp;</td></tr>
351+
<tr><td><b>SCrypt</b></td><td>&nbsp;</td><td>&nbsp;</td></tr>
352+
</table>
344353

345354
<h4>IESCipher</h4>
346355
<p>
@@ -406,14 +415,13 @@ <h3>4.4 Elliptic Curve Transforms.</h3>
406415
<h3>4.4 TLS/DTLS</h3>
407416

408417
<p>
409-
The org.bouncycastle.crypto.tls package contains implementations for TLS 1.1 and DTLS 1.0.
418+
The org.bouncycastle.crypto.tls package contains implementations for TLS 1.1, 1.2 and DTLS 1.0, 1.2.
410419
</p>
411420

412421
<h3>4.5 Deterministic Random Bit Generators (DRBG) and SecureRandom wrappers</h3>
413422

414423
<p>
415-
The org.bouncycastle.crypto.prng package contains implementations for a variety of bit generators including those
416-
from SP 800-90A, as well as builders for SecureRandom objects based around them.
424+
The org.bouncycastle.crypto.prng package contains implementations for a variety of bit generators including those from SP 800-90A and X9.31, as well as builders for SecureRandom objects based around them.
417425
</p>
418426
<h3>4.6 ASN.1 package</h3>
419427

@@ -730,20 +738,20 @@ <h4>MAC</h4>
730738

731739
<p>Examples:
732740
<ul>
733-
<li>DESMac
734-
<li>DESMac/CFB8
735-
<li>DESedeMac
736-
<li>DESedeMac/CFB8
737-
<li>DESedeMac64
738-
<li>SKIPJACKMac
739-
<li>SKIPJACKMac/CFB8
740-
<li>IDEAMac
741-
<li>IDEAMac/CFB8
742-
<li>RC2Mac
743-
<li>RC2Mac/CFB8
744-
<li>RC5Mac
745-
<li>RC5Mac/CFB8
746-
<li>ISO9797ALG3Mac
741+
<li>DESMac</li>
742+
<li>DESMac/CFB8</li>
743+
<li>DESedeMac</li>
744+
<li>DESedeMac/CFB8</li>
745+
<li>DESedeMac64</li>
746+
<li>SKIPJACKMac</li>
747+
<li>SKIPJACKMac/CFB8</li>
748+
<li>IDEAMac</li>
749+
<li>IDEAMac/CFB8</li>
750+
<li>RC2Mac</li>
751+
<li>RC2Mac/CFB8</li>
752+
<li>RC5Mac</li>
753+
<li>RC5Mac/CFB8</li>
754+
<li>ISO9797ALG3Mac</li>
747755
</ul>
748756

749757

@@ -752,59 +760,72 @@ <h4>Signature Algorithms</h4>
752760
<p>Schemes:
753761
<ul>
754762
<li>DSTU4145</li>
755-
<li>GOST3411withGOST3410 (GOST3411withGOST3410-94)
756-
<li>GOST3411withECGOST3410 (GOST3411withGOST3410-2001)
757-
<li>MD2withRSA
758-
<li>MD5withRSA
759-
<li>SHA1withRSA
760-
<li>RIPEMD128withRSA
761-
<li>RIPEMD160withRSA
762-
<li>RIPEMD160withECDSA
763-
<li>RIPEMD256withRSA
764-
<li>SHA1withDSA
765-
<li>SHA224withDSA
766-
<li>SHA256withDSA
767-
<li>SHA384withDSA
768-
<li>SHA512withDSA
769-
<li>SHA1withDetDSA
770-
<li>SHA224withDetDSA
771-
<li>SHA256withDetDSA
772-
<li>SHA384withDetDSA
773-
<li>SHA512withDetDSA
774-
<li>NONEwithDSA
775-
<li>SHA1withDetECDSA
776-
<li>SHA224withDetECDSA
777-
<li>SHA256withDetECDSA
778-
<li>SHA384withDetECDSA
779-
<li>SHA512withDetECDSA
780-
<li>SHA1withECDSA
781-
<li>NONEwithECDSA
782-
<li>SHA224withECDSA
783-
<li>SHA256withECDSA
784-
<li>SHA384withECDSA
785-
<li>SHA512withECDSA
786-
<li>SHA1withECNR
787-
<li>SHA224withECNR
788-
<li>SHA256withECNR
789-
<li>SHA384withECNR
790-
<li>SHA512withECNR
791-
<li>SHA224withRSA
792-
<li>SHA256withRSA
793-
<li>SHA384withRSA
794-
<li>SHA512withRSA
795-
<li>SHA1withRSAandMGF1
796-
<li>SHA256withRSAandMGF1
797-
<li>SHA384withRSAandMGF1
798-
<li>SHA512withRSAandMGF1
763+
<li>GOST3411withGOST3410 (GOST3411withGOST3410-94)</li>
764+
<li>GOST3411withECGOST3410 (GOST3411withGOST3410-2001)</li>
765+
<li>MD2withRSA</li>
766+
<li>MD5withRSA</li>
767+
<li>SHA1withRSA</li>
768+
<li>RIPEMD128withRSA</li>
769+
<li>RIPEMD160withRSA</li>
770+
<li>RIPEMD160withECDSA</li>
771+
<li>RIPEMD256withRSA</li>
772+
<li>SHA1withDSA</li>
773+
<li>SHA224withDSA</li>
774+
<li>SHA256withDSA</li>
775+
<li>SHA384withDSA</li>
776+
<li>SHA512withDSA</li>
777+
<li>SHA1withDetDSA</li>
778+
<li>SHA224withDetDSA</li>
779+
<li>SHA256withDetDSA</li>
780+
<li>SHA384withDetDSA</li>
781+
<li>SHA512withDetDSA</li>
782+
<li>NONEwithDSA</li>
783+
<li>SHA1withDetECDSA</li>
784+
<li>SHA224withDetECDSA</li>
785+
<li>SHA256withDetECDSA</li>
786+
<li>SHA384withDetECDSA</li>
787+
<li>SHA512withDetECDSA</li>
788+
<li>SHA1withECDSA</li>
789+
<li>NONEwithECDSA</li>
790+
<li>SHA224withECDSA</li>
791+
<li>SHA256withECDSA</li>
792+
<li>SHA384withECDSA</li>
793+
<li>SHA512withECDSA</li>
794+
<li>SHA1withECNR</li>
795+
<li>SHA224withECNR</li>
796+
<li>SHA256withECNR</li>
797+
<li>SHA384withECNR</li>
798+
<li>SHA512withECNR</li>
799+
<li>SHA224withRSA</li>
800+
<li>SHA256withRSA</li>
801+
<li>SHA384withRSA</li>
802+
<li>SHA512withRSA</li>
803+
<li>SHA1withRSAandMGF1</li>
804+
<li>SHA256withRSAandMGF1</li>
805+
<li>SHA384withRSAandMGF1</li>
806+
<li>SHA512withRSAandMGF1</li>
807+
<li>SHA1withRSA/ISO9796-2</li>
808+
<li>RIPEMD160withRSA/ISO9796-2</li>
809+
<li>SHA1withRSA/X9.31</li>
810+
<li>SHA224withRSA/X9.31</li>
811+
<li>SHA256withRSA/X9.31</li>
812+
<li>SHA384withRSA/X9.31</li>
813+
<li>SHA512withRSA/X9.31</li>
814+
<li>RIPEMD128withRSA/X9.31</li>
815+
<li>RIPEMD160withRSA/X9.31</li>
816+
<li>WHIRLPOOLwithRSA/X9.31</li>
799817
</ul>
800818

801-
<h4>PBE</h4>
819+
<h4>Password Hashing and PBE</h4>
802820

803821
<p>Schemes:
804822
<ul>
805-
<li>PKCS5S1, any Digest, any symmetric Cipher, ASCII
806-
<li>PKCS5S2, SHA1/HMac, any symmetric Cipher, ASCII, UTF8
807-
<li>PKCS12, any Digest, any symmetric Cipher, Unicode
823+
<li>BCrypt</li>
824+
<li>OpenBSDBcyrpt</li>
825+
<li>SCrypt</li>
826+
<li>PKCS5S1, any Digest, any symmetric Cipher, ASCII </li>
827+
<li>PKCS5S2, SHA1/HMac, any symmetric Cipher, ASCII, UTF8</li>
828+
<li>PKCS12, any Digest, any symmetric Cipher, Unicode </li>
808829
</ul>
809830

810831
<p>

0 commit comments

Comments
 (0)