Skip to content

Commit 127a308

Browse files
vanitasvitaevanitasvitae
committed
Update crypto-refresh references to RFC9580
1 parent 303d59f commit 127a308

37 files changed

+112
-111
lines changed

‎pg/src/main/j2me/org/bouncycastle/bcpg/S2K.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ public Argon2Params(byte[] salt, int passes, int parallelism, int memSizeExp)
452452

453453
// log_2(p) = log_e(p) / log_e(2)
454454
//double log2_p = Math.log((double)parallelism) / Math.log(2.0);
455-
// see https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-05.html#section-3.7.1.4-5
455+
// see https://www.rfc-editor.org/rfc/rfc9580.html#section-3.7.1.4-5
456456
//if (memSizeExp < (3 + Math.ceil(log2_p)) || memSizeExp > 31)
457457
//{
458458
//throw new IllegalArgumentException("Memory size exponent MUST be between 3+ceil(log_2(parallelism)) and 31");

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
/**
44
* AEAD Algorithm IDs.
5-
* Crypto-Refresh (OpenPGP) defines IDs 1 through 3, while LibrePGP only defines 1 and 2.
6-
* Further, the use of AEAD differs between C-R and LibrePGP.
5+
* RFC9580 (OpenPGP) defines IDs 1 through 3, while LibrePGP only defines 1 and 2.
6+
* Further, the use of AEAD differs between OpenPGP and LibrePGP.
77
*
8-
* @see <a href="https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-13.html#name-aead-algorithms">
9-
* Crypto-Refresh: AEAD Algorithms</a>
8+
* @see <a href="https://www.rfc-editor.org/rfc/rfc9580.html#name-aead-algorithms">
9+
* OpenPGP - AEAD Algorithms</a>
1010
* @see <a href="https://www.ietf.org/archive/id/draft-koch-librepgp-00.html#name-encryption-modes">
1111
* LibrePGP - Encryption Modes</a>
1212
*/
@@ -18,7 +18,7 @@ public interface AEADAlgorithmTags
1818
int EAX = 1;
1919
/**
2020
* OCB with 15-bit nonce/IV and 16-bit auth tag length.
21-
* C-R compliant implementations MUST implement OCB.
21+
* RFC9580-compliant implementations MUST implement OCB.
2222
*/
2323
int OCB = 2;
2424
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
*
66
* @see <a href="https://www.rfc-editor.org/rfc/rfc4880.html#section-9.3">
77
* RFC4880 - Compression Algorithms</a>
8+
* @see <a href="https://www.rfc-editor.org/rfc/rfc9580.html#name-compression-algorithms">
9+
* RFC9580 - Compression Algorithms</a>
810
* @see <a href="https://www.ietf.org/archive/id/draft-koch-librepgp-00.html#name-compression-algorithms">
911
* LibrePGP - Compression Algorithms</a>
10-
* @see <a href="https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-13.html#name-compression-algorithms">
11-
* Crypto-Refresh - Compression Algorithms</a>
1212
*/
1313
public interface CompressionAlgorithmTags
1414
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* If you want to be compatible with legacy applications however, you should use this class instead.
1717
* Note though, that for v6 keys, {@link X25519PublicBCPGKey} or {@link X448PublicBCPGKey} MUST be used for X25519, X448.
1818
*
19-
* @see <a href="https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-13.html#name-algorithm-specific-part-for-ecd">
20-
* Crypto-Refresh - Algorithm-Specific Parts for ECDH Keys</a>
19+
* @see <a href="https://www.rfc-editor.org/rfc/rfc9580.html#name-algorithm-specific-part-for-ecd">
20+
* OpenPGP - Algorithm-Specific Parts for ECDH Keys</a>
2121
*/
2222
public class ECDHPublicBCPGKey
2323
extends ECPublicBCPGKey

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
* Base class for an ECDSA Public Key.
1111
* This type is used with {@link PublicKeyAlgorithmTags#ECDSA} and the curve is identified by providing an OID.
1212
*
13-
* @see <a href="https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-13.html#name-algorithm-specific-part-for-ec">
14-
* Crypto-Refresh - Algorithm-Specific Parts for ECDSA Keys</a>
13+
* @see <a href="https://www.rfc-editor.org/rfc/rfc9580.html#name-algorithm-specific-part-for-ec">
14+
* OpenPGP - Algorithm-Specific Parts for ECDSA Keys</a>
1515
*/
1616
public class ECDSAPublicBCPGKey
1717
extends ECPublicBCPGKey

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
* If you want to be compatible with legacy applications however, you should use this class instead.
1717
* Note though, that for v6 keys, {@link X25519SecretBCPGKey} or {@link X448SecretBCPGKey} MUST be used for X25519, X448.
1818
*
19-
* @see <a href="https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-13.html#name-algorithm-specific-part-for-ecd">
20-
* Crypto-Refresh - Algorithm-Specific Parts for ECDH Keys</a>
21-
* @see <a href="https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-13.html#name-algorithm-specific-part-for-ec">
22-
* Crypto-Refresh - Algorithm-Specific Parts for ECDSA Keys</a>
23-
* @see <a href="https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-13.html#name-curve25519legacy-ecdh-secre">
24-
* Crypto-Refresh - Curve25519Legacy ECDH Secret Key Material (deprecated)</a>
19+
* @see <a href="https://www.rfc-editor.org/rfc/rfc9580.html#name-algorithm-specific-part-for-ecd">
20+
* OpenPGP - Algorithm-Specific Parts for ECDH Keys</a>
21+
* @see <a href="https://www.rfc-editor.org/rfc/rfc9580.html#name-algorithm-specific-part-for-ec">
22+
* OpenPGP - Algorithm-Specific Parts for ECDSA Keys</a>
23+
* @see <a href="https://www.rfc-editor.org/rfc/rfc9580.html#name-curve25519legacy-ecdh-secre">
24+
* OpenPGP - Curve25519Legacy ECDH Secret Key Material (deprecated)</a>
2525
*/
2626
public class ECSecretBCPGKey
2727
extends BCPGObject

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
/**
66
* Public key of type {@link PublicKeyAlgorithmTags#Ed25519}.
7-
* This type was introduced with Crypto-Refresh and can be used with v4, v6 keys.
7+
* This type was introduced with RFC9580 and can be used with v4, v6 keys.
88
* Note however, that legacy implementations might not understand this key type yet.
99
* For a key type compatible with legacy v4 implementations, see {@link EdDSAPublicBCPGKey} with
1010
* {@link PublicKeyAlgorithmTags#EDDSA_LEGACY}.
1111
*
12-
* @see <a href="https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-13.html#name-algorithm-specific-part-for-ed2">
13-
* Crypto-Refresh - Algorithm-Specific Part for Ed25519 Keys</a>
12+
* @see <a href="https://www.rfc-editor.org/rfc/rfc9580.html#name-algorithm-specific-part-for-ed2">
13+
* OpenPGP - Algorithm-Specific Part for Ed25519 Keys</a>
1414
*/
1515
public class Ed25519PublicBCPGKey
1616
extends OctetArrayBCPGKey

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
/**
66
* Secret key of type {@link PublicKeyAlgorithmTags#Ed25519}.
7-
* This type was introduced with Crypto-Refresh and can be used with v4, v6 keys.
7+
* This type was introduced with RFC9580 and can be used with v4, v6 keys.
88
* Note however, that legacy implementations might not understand this key type yet.
99
* For a key type compatible with legacy v4 implementations, see {@link EdDSAPublicBCPGKey} with
1010
* {@link PublicKeyAlgorithmTags#EDDSA_LEGACY}.
1111
*
12-
* @see <a href="https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-13.html#name-algorithm-specific-part-for-ed2">
13-
* Crypto-Refresh - Algorithm-Specific Part for Ed25519 Keys</a>
12+
* @see <a href="https://www.rfc-editor.org/rfc/rfc9580.html#name-algorithm-specific-part-for-ed2">
13+
* OpenPGP - Algorithm-Specific Part for Ed25519 Keys</a>
1414
*/
1515
public class Ed25519SecretBCPGKey
1616
extends OctetArrayBCPGKey

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
/**
66
* Public key of type {@link PublicKeyAlgorithmTags#Ed448}.
7-
* This type was introduced with Crypto-Refresh and can be used with v4, v6 keys.
7+
* This type was introduced with RFC9580 and can be used with v4, v6 keys.
88
* Note however, that legacy implementations might not understand this key type yet.
99
* For a key type compatible with legacy v4 implementations, see {@link EdDSAPublicBCPGKey} with
1010
* {@link PublicKeyAlgorithmTags#EDDSA_LEGACY}.
1111
*
12-
* @see <a href="https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-13.html#name-algorithm-specific-part-for-ed4">
13-
* Crypto-Refresh - Algorithm-Specific Part for Ed448 Keys</a>
12+
* @see <a href="https://www.rfc-editor.org/rfc/rfc9580.html#name-algorithm-specific-part-for-ed4">
13+
* OpenPGP - Algorithm-Specific Part for Ed448 Keys</a>
1414
*/
1515
public class Ed448PublicBCPGKey
1616
extends OctetArrayBCPGKey

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
/**
66
* Secret key of type {@link PublicKeyAlgorithmTags#Ed448}.
7-
* This type was introduced with Crypto-Refresh and can be used with v4, v6 keys.
7+
* This type was introduced with RFC9580 and can be used with v4, v6 keys.
88
* Note however, that legacy implementations might not understand this key type yet.
99
* For a key type compatible with legacy v4 implementations, see {@link EdDSAPublicBCPGKey} with
1010
* {@link PublicKeyAlgorithmTags#EDDSA_LEGACY}.
1111
*
12-
* @see <a href="https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-13.html#name-algorithm-specific-part-for-ed4">
13-
* Crypto-Refresh - Algorithm-Specific Part for Ed448 Keys</a>
12+
* @see <a href="https://www.rfc-editor.org/rfc/rfc9580.html#name-algorithm-specific-part-for-ed4">
13+
* OpenPGP - Algorithm-Specific Part for Ed448 Keys</a>
1414
*/
1515
public class Ed448SecretBCPGKey
1616
extends OctetArrayBCPGKey

0 commit comments

Comments
 (0)