Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement Argon2 S2K mechanism #1132

Closed
wants to merge 8 commits into from
Closed

Implement Argon2 S2K mechanism #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9896d3
Add padding packet tag
vanitasvitae Mar 23, 2022
b9c9ca6
Add third-party confirmation signature type tag
vanitasvitae Mar 23, 2022
cd6ee5e
Update SignatureSubpacketTags
vanitasvitae Mar 23, 2022
32a51fc
Add AEADAlgorithmTags
vanitasvitae Mar 23, 2022
960bbb8
Update HashAlgorithmTags
vanitasvitae Mar 23, 2022
d6df05d
SecretKeyPacket: Add AEAD usage tag
vanitasvitae Mar 23, 2022
b0aef34
S2K: Add Argon2 algorithm tag
vanitasvitae Mar 23, 2022
a7bfbfc
S2K: Add support for Argon2 (encoding, decoding only)
vanitasvitae Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pg/src/main/java/org/bouncycastle/bcpg/AEADAlgorithmTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package org.bouncycastle.bcpg;

public interface AEADAlgorithmTags {
int EAX = 1; // EAX (IV len: 16 octets, Tag len: 16 octets)
int OCB = 2; // OCB (IV len: 15 octets, Tag len: 16 octets)
int GCM = 3; // GCM (IV len: 12 octets, Tag len: 16 octets)
}
6 changes: 2 additions & 4 deletions pg/src/main/java/org/bouncycastle/bcpg/HashAlgorithmTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.bouncycastle.bcpg;

import org.bouncycastle.util.Strings;

/**
* basic tags for hash algorithms
*/
Expand All @@ -19,12 +17,12 @@ public interface HashAlgorithmTags
public static final int SHA384 = 9; // SHA-384
public static final int SHA512 = 10; // SHA-512
public static final int SHA224 = 11; // SHA-224
public static final int SHA3_256 = 12; // SHA3-256
public static final int SHA3_512 = 14; // SHA3-512

public static final int MD4 = 301;
public static final int SHA3_224 = 312; // SHA3-224
public static final int SHA3_256 = 313; //SHA3-256
public static final int SHA3_384 = 314; // SHA3-384
public static final int SHA3_512 = 315; // SHA3-512

public static final int SM3 = 326; // SHA3-512

Expand Down
1 change: 1 addition & 0 deletions pg/src/main/java/org/bouncycastle/bcpg/PacketTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public interface PacketTags
public static final int USER_ATTRIBUTE = 17; // User attribute
public static final int SYM_ENC_INTEGRITY_PRO = 18; // Symmetric encrypted, integrity protected
public static final int MOD_DETECTION_CODE = 19; // Modification detection code
public static final int PADDING = 21; // Padding Packet

public static final int EXPERIMENTAL_1 = 60; // Private or Experimental Values
public static final int EXPERIMENTAL_2 = 61;
Expand Down
Loading