Skip to content

Commit

Permalink
update to latest composite, patches to generator code following relea…
Browse files Browse the repository at this point in the history 
…se of new OID for composite, update for new BC beta (#158)

* updated for BC beta

* updated R4 artifacts

* removed javac!
  • Loading branch information
@dghgit
dghgit authored Nov 3, 2024
1 parent aece5fc commit 2167061
Show file tree
Hide file tree
Showing 6 changed files with 116 additions and 70 deletions.
Binary file modified providers/bc/artifacts_certs_r4.zip
View file
Binary file not shown.
2 changes: 0 additions & 2 deletions providers/bc/check_r3.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ base=`cat lib/beta.ver`
fi
)

javac -d classes -cp lib/bcprov-${base}.jar:lib/bcutil-${base}.jar:lib/bcpkix-${base}.jar src/main/java/*.java

if [ "$1" != "" ] && [ "$2" != "" ]
then
java -cp classes:lib/bcprov-${base}.jar:lib/bcutil-${base}.jar:lib/bcpkix-${base}.jar R3ArtifactParser $1 $2
Expand Down
2 changes: 0 additions & 2 deletions providers/bc/gen_r3.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,4 @@ base=`cat lib/beta.ver`
fi
)

javac -d classes -cp lib/bcprov-${base}.jar:lib/bcutil-${base}.jar:lib/bcpkix-${base}.jar src/main/java/*.java

java -cp classes:lib/bcprov-${base}.jar:lib/bcutil-${base}.jar:lib/bcpkix-${base}.jar R3ArtifactGenerator
90 changes: 58 additions & 32 deletions providers/bc/src/main/java/R3ArtifactGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,22 +104,35 @@ public class R3ArtifactGenerator
NISTObjectIdentifiers.id_hash_slh_dsa_shake_192s_with_shake256,
NISTObjectIdentifiers.id_hash_slh_dsa_shake_256f_with_shake256,
NISTObjectIdentifiers.id_hash_slh_dsa_shake_256s_with_shake256,
MiscObjectIdentifiers.id_MLDSA44_RSA2048_PSS_SHA256,
MiscObjectIdentifiers.id_MLDSA44_RSA2048_PKCS15_SHA256,
MiscObjectIdentifiers.id_MLDSA44_Ed25519_SHA512,
MiscObjectIdentifiers.id_MLDSA44_ECDSA_P256_SHA256,
MiscObjectIdentifiers.id_MLDSA44_ECDSA_brainpoolP256r1_SHA256,
MiscObjectIdentifiers.id_MLDSA65_RSA3072_PSS_SHA512,
MiscObjectIdentifiers.id_MLDSA65_RSA3072_PKCS15_SHA512,
MiscObjectIdentifiers.id_MLDSA65_ECDSA_P256_SHA512,
MiscObjectIdentifiers.id_MLDSA65_ECDSA_brainpoolP256r1_SHA512,
MiscObjectIdentifiers.id_MLDSA65_Ed25519_SHA512,
MiscObjectIdentifiers.id_MLDSA87_ECDSA_P384_SHA512,
MiscObjectIdentifiers.id_MLDSA87_ECDSA_brainpoolP384r1_SHA512,
MiscObjectIdentifiers.id_MLDSA87_Ed448_SHA512,
MiscObjectIdentifiers.id_Falcon512_ECDSA_P256_SHA256,
MiscObjectIdentifiers.id_Falcon512_ECDSA_brainpoolP256r1_SHA256,
MiscObjectIdentifiers.id_Falcon512_Ed25519_SHA512
MiscObjectIdentifiers.id_MLDSA44_RSA2048_PSS_SHA256 ,
MiscObjectIdentifiers.id_MLDSA44_RSA2048_PKCS15_SHA256 ,
MiscObjectIdentifiers.id_MLDSA44_Ed25519_SHA512 ,
MiscObjectIdentifiers.id_MLDSA44_ECDSA_P256_SHA256 ,
MiscObjectIdentifiers.id_MLDSA65_RSA3072_PSS_SHA256 ,
MiscObjectIdentifiers.id_MLDSA65_RSA3072_PKCS15_SHA256 ,
MiscObjectIdentifiers.id_MLDSA65_RSA4096_PSS_SHA384 ,
MiscObjectIdentifiers.id_MLDSA65_RSA4096_PKCS15_SHA384 ,
MiscObjectIdentifiers.id_MLDSA65_ECDSA_P384_SHA384 ,
MiscObjectIdentifiers.id_MLDSA65_ECDSA_brainpoolP256r1_SHA256 ,
MiscObjectIdentifiers.id_MLDSA65_Ed25519_SHA512 ,
MiscObjectIdentifiers.id_MLDSA87_ECDSA_P384_SHA384 ,
MiscObjectIdentifiers.id_MLDSA87_ECDSA_brainpoolP384r1_SHA384 ,
MiscObjectIdentifiers.id_MLDSA87_Ed448_SHA512 ,

MiscObjectIdentifiers.id_HashMLDSA44_RSA2048_PSS_SHA256 ,
MiscObjectIdentifiers.id_HashMLDSA44_RSA2048_PKCS15_SHA256 ,
MiscObjectIdentifiers.id_HashMLDSA44_Ed25519_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA44_ECDSA_P256_SHA256 ,
MiscObjectIdentifiers.id_HashMLDSA65_RSA3072_PSS_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA65_RSA3072_PKCS15_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA65_RSA4096_PSS_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA65_RSA4096_PKCS15_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA65_ECDSA_P384_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA65_ECDSA_brainpoolP256r1_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA65_Ed25519_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA87_ECDSA_P384_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA87_ECDSA_brainpoolP384r1_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA87_Ed448_SHA512
};


Expand Down Expand Up @@ -157,23 +170,36 @@ public class R3ArtifactGenerator
"slh-dsa-shake-192s-with-shake256",
"slh-dsa-shake-256f-with-shake256",
"slh-dsa-shake-256s-with-shake256",
"MLDSA44-RSA2048-PSS-SHA256",
"MLDSA44-RSA2048-PKCS15-SHA256",
"MLDSA44-Ed25519-SHA512",
"MLDSA44-ECDSA-P256-SHA256",
"MLDSA44-ECDSA-brainpoolP256r1-SHA256",
"MLDSA65-RSA3072-PSS-SHA512",
"MLDSA65-RSA3072-PKCS15-SHA512",
"MLDSA65-ECDSA-P256-SHA512",
"MLDSA65-ECDSA-brainpoolP256r1-SHA512",
"MLDSA65-Ed25519-SHA512",
"MLDSA87-ECDSA-P384-SHA512",
"MLDSA87-ECDSA-brainpoolP384r1-SHA512",
"MLDSA87-Ed448-SHA512",
"Falcon512-ECDSA-P256-SHA256",
"Falcon512-ECDSA-brainpoolP256r1-SHA256",
"Falcon512-Ed25519-SHA512",
"MLDSA44-RSA2048-PSS-SHA256",
"MLDSA44-RSA2048-PKCS15-SHA256",
"MLDSA44-Ed25519-SHA512",
"MLDSA44-ECDSA-P256-SHA256",
"MLDSA65-RSA3072-PSS-SHA256",
"MLDSA65-RSA3072-PKCS15-SHA256",
"MLDSA65-RSA4096-PSS-SHA384",
"MLDSA65-RSA4096-PKCS15-SHA384",
"MLDSA65-ECDSA-P384-SHA384",
"MLDSA65-ECDSA-brainpoolP256r1-SHA256",
"MLDSA65-Ed25519-SHA512",
"MLDSA87-ECDSA-P384-SHA384",
"MLDSA87-ECDSA-brainpoolP384r1-SHA384",
"MLDSA87-Ed448-SHA512",
"HashMLDSA44-RSA2048-PSS-SHA256",
"HashMLDSA44-RSA2048-PKCS15-SHA256",
"HashMLDSA44-Ed25519-SHA512",
"HashMLDSA44-ECDSA-P256-SHA256",
"HashMLDSA65-RSA3072-PSS-SHA512",
"HashMLDSA65-RSA3072-PKCS15-SHA512",
"HashMLDSA65-RSA4096-PSS-SHA512",
"HashMLDSA65-RSA4096-PKCS15-SHA512",
"HashMLDSA65-ECDSA-P384-SHA512",
"HashMLDSA65-ECDSA-brainpoolP256r1-SHA512",
"HashMLDSA65-Ed25519-SHA512",
"HashMLDSA87-ECDSA-P384-SHA512",
"HashMLDSA87-ECDSA-brainpoolP384r1-SHA512",
"HashMLDSA87-Ed448-SHA512"
};

private static File aDir = new File("artifacts_certs_r3");

private static final ASN1ObjectIdentifier[] kemAlgorithms =
Expand Down
90 changes: 58 additions & 32 deletions providers/bc/src/main/java/R4ArtifactGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,35 @@ public class R4ArtifactGenerator
NISTObjectIdentifiers.id_hash_slh_dsa_shake_192s_with_shake256,
NISTObjectIdentifiers.id_hash_slh_dsa_shake_256f_with_shake256,
NISTObjectIdentifiers.id_hash_slh_dsa_shake_256s_with_shake256,
MiscObjectIdentifiers.id_MLDSA44_RSA2048_PSS_SHA256,
MiscObjectIdentifiers.id_MLDSA44_RSA2048_PKCS15_SHA256,
MiscObjectIdentifiers.id_MLDSA44_Ed25519_SHA512,
MiscObjectIdentifiers.id_MLDSA44_ECDSA_P256_SHA256,
MiscObjectIdentifiers.id_MLDSA44_ECDSA_brainpoolP256r1_SHA256,
MiscObjectIdentifiers.id_MLDSA65_RSA3072_PSS_SHA512,
MiscObjectIdentifiers.id_MLDSA65_RSA3072_PKCS15_SHA512,
MiscObjectIdentifiers.id_MLDSA65_ECDSA_P256_SHA512,
MiscObjectIdentifiers.id_MLDSA65_ECDSA_brainpoolP256r1_SHA512,
MiscObjectIdentifiers.id_MLDSA65_Ed25519_SHA512,
MiscObjectIdentifiers.id_MLDSA87_ECDSA_P384_SHA512,
MiscObjectIdentifiers.id_MLDSA87_ECDSA_brainpoolP384r1_SHA512,
MiscObjectIdentifiers.id_MLDSA87_Ed448_SHA512,
MiscObjectIdentifiers.id_Falcon512_ECDSA_P256_SHA256,
MiscObjectIdentifiers.id_Falcon512_ECDSA_brainpoolP256r1_SHA256,
MiscObjectIdentifiers.id_Falcon512_Ed25519_SHA512
MiscObjectIdentifiers.id_MLDSA44_RSA2048_PSS_SHA256 ,
MiscObjectIdentifiers.id_MLDSA44_RSA2048_PKCS15_SHA256 ,
MiscObjectIdentifiers.id_MLDSA44_Ed25519_SHA512 ,
MiscObjectIdentifiers.id_MLDSA44_ECDSA_P256_SHA256 ,
MiscObjectIdentifiers.id_MLDSA65_RSA3072_PSS_SHA256 ,
MiscObjectIdentifiers.id_MLDSA65_RSA3072_PKCS15_SHA256 ,
MiscObjectIdentifiers.id_MLDSA65_RSA4096_PSS_SHA384 ,
MiscObjectIdentifiers.id_MLDSA65_RSA4096_PKCS15_SHA384 ,
MiscObjectIdentifiers.id_MLDSA65_ECDSA_P384_SHA384 ,
MiscObjectIdentifiers.id_MLDSA65_ECDSA_brainpoolP256r1_SHA256 ,
MiscObjectIdentifiers.id_MLDSA65_Ed25519_SHA512 ,
MiscObjectIdentifiers.id_MLDSA87_ECDSA_P384_SHA384 ,
MiscObjectIdentifiers.id_MLDSA87_ECDSA_brainpoolP384r1_SHA384 ,
MiscObjectIdentifiers.id_MLDSA87_Ed448_SHA512 ,

MiscObjectIdentifiers.id_HashMLDSA44_RSA2048_PSS_SHA256 ,
MiscObjectIdentifiers.id_HashMLDSA44_RSA2048_PKCS15_SHA256 ,
MiscObjectIdentifiers.id_HashMLDSA44_Ed25519_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA44_ECDSA_P256_SHA256 ,
MiscObjectIdentifiers.id_HashMLDSA65_RSA3072_PSS_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA65_RSA3072_PKCS15_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA65_RSA4096_PSS_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA65_RSA4096_PKCS15_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA65_ECDSA_P384_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA65_ECDSA_brainpoolP256r1_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA65_Ed25519_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA87_ECDSA_P384_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA87_ECDSA_brainpoolP384r1_SHA512 ,
MiscObjectIdentifiers.id_HashMLDSA87_Ed448_SHA512
};


Expand Down Expand Up @@ -159,23 +172,36 @@ public class R4ArtifactGenerator
"slh-dsa-shake-192s-with-shake256",
"slh-dsa-shake-256f-with-shake256",
"slh-dsa-shake-256s-with-shake256",
"MLDSA44-RSA2048-PSS-SHA256",
"MLDSA44-RSA2048-PKCS15-SHA256",
"MLDSA44-Ed25519-SHA512",
"MLDSA44-ECDSA-P256-SHA256",
"MLDSA44-ECDSA-brainpoolP256r1-SHA256",
"MLDSA65-RSA3072-PSS-SHA512",
"MLDSA65-RSA3072-PKCS15-SHA512",
"MLDSA65-ECDSA-P256-SHA512",
"MLDSA65-ECDSA-brainpoolP256r1-SHA512",
"MLDSA65-Ed25519-SHA512",
"MLDSA87-ECDSA-P384-SHA512",
"MLDSA87-ECDSA-brainpoolP384r1-SHA512",
"MLDSA87-Ed448-SHA512",
"Falcon512-ECDSA-P256-SHA256",
"Falcon512-ECDSA-brainpoolP256r1-SHA256",
"Falcon512-Ed25519-SHA512",
"MLDSA44-RSA2048-PSS-SHA256",
"MLDSA44-RSA2048-PKCS15-SHA256",
"MLDSA44-Ed25519-SHA512",
"MLDSA44-ECDSA-P256-SHA256",
"MLDSA65-RSA3072-PSS-SHA256",
"MLDSA65-RSA3072-PKCS15-SHA256",
"MLDSA65-RSA4096-PSS-SHA384",
"MLDSA65-RSA4096-PKCS15-SHA384",
"MLDSA65-ECDSA-P384-SHA384",
"MLDSA65-ECDSA-brainpoolP256r1-SHA256",
"MLDSA65-Ed25519-SHA512",
"MLDSA87-ECDSA-P384-SHA384",
"MLDSA87-ECDSA-brainpoolP384r1-SHA384",
"MLDSA87-Ed448-SHA512",
"HashMLDSA44-RSA2048-PSS-SHA256",
"HashMLDSA44-RSA2048-PKCS15-SHA256",
"HashMLDSA44-Ed25519-SHA512",
"HashMLDSA44-ECDSA-P256-SHA256",
"HashMLDSA65-RSA3072-PSS-SHA512",
"HashMLDSA65-RSA3072-PKCS15-SHA512",
"HashMLDSA65-RSA4096-PSS-SHA512",
"HashMLDSA65-RSA4096-PKCS15-SHA512",
"HashMLDSA65-ECDSA-P384-SHA512",
"HashMLDSA65-ECDSA-brainpoolP256r1-SHA512",
"HashMLDSA65-Ed25519-SHA512",
"HashMLDSA87-ECDSA-P384-SHA512",
"HashMLDSA87-ECDSA-brainpoolP384r1-SHA512",
"HashMLDSA87-Ed448-SHA512"
};

private static File aDir = new File("artifacts_certs_r4");

private static final ASN1ObjectIdentifier[] kemAlgorithms =
Expand Down
2 changes: 0 additions & 2 deletions providers/bc/verify_r3.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ cd $SCRIPT_DIR

base=`cat lib/beta.ver`

javac -d classes -cp lib/bcprov-${base}.jar:lib/bcutil-${base}.jar:lib/bcpkix-${base}.jar src/main/java/*.java

java -cp classes:lib/bcprov-${base}.jar:lib/bcutil-${base}.jar:lib/bcpkix-${base}.jar Verify self-signed $1

0 comments on commit 2167061

Please sign in to comment.