Skip to content

Commit

Permalink
add dsc rsa sha1 2048
Browse files Browse the repository at this point in the history
  • Loading branch information
seshanthS committed Jan 3, 2025
1 parent dd83c85 commit 6b98913
Show file tree
Hide file tree
Showing 7 changed files with 146 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pragma circom 2.1.9;

include "../openpassport_dsc.circom";

component main { public [ merkle_root ] } = OPENPASSPORT_DSC(3, 64, 32, 64, 32, 1664, 256, 12);
74 changes: 72 additions & 2 deletions circuits/tests/dsc.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,51 @@ import {
mock_csca_sha512_brainpoolP384r1_384,
mock_dsc_sha1_secp384r1_384,
mock_csca_sha1_secp384r1_384,
mock_dsc_sha1_brainpoolP256r1_256,
mock_csca_sha1_brainpoolP256r1_256,
mock_dsc_sha256_rsapss_2048,
mock_csca_sha256_rsapss_2048,
mock_dsc_sha256_rsapss_3_3072,
mock_dsc_sha256_rsapss_65537_3072,
mock_csca_sha256_rsapss_65537_3072,
mock_dsc_sha256_rsapss_3072,
mock_csca_sha256_rsapss_3072,
mock_csca_sha256_rsapss_3_3072,
mock_dsc_sha256_rsapss_3_4096,
mock_csca_sha256_rsapss_3_4096,
mock_dsc_sha384_rsapss_65537_3072,
mock_csca_sha384_rsapss_65537_3072,
mock_dsc_sha384_rsapss_65537_4096,
mock_csca_sha384_rsapss_65537_4096,
mock_dsc_sha1_rsa_2048,
mock_csca_sha1_rsa_2048,
mock_dsc_sha1_rsa_3072,
mock_csca_sha1_rsa_3072,
} from '../../common/src/constants/mockCertificates';
import { max_cert_bytes } from '../../common/src/constants/constants';
import { getCircuitName } from '../../common/src/utils/certificates/handleCertificate';

const sigAlgs = [
// { sigAlg: 'rsa', hashFunction: 'sha1', domainParameter: '65537', keyLength: '4096' },
// { sigAlg: 'rsa', hashFunction: 'sha1', domainParameter: '65537', keyLength: '2048' },
{ sigAlg: 'rsa', hashFunction: 'sha1', domainParameter: '65537', keyLength: '3072' },


// { sigAlg: 'rsa', hashFunction: 'sha256', domainParameter: '65537', keyLength: '4096' },
// { sigAlg: 'rsapss', hashFunction: 'sha256', domainParameter: '65537', keyLength: '4096' },
// { sigAlg: 'rsapss', hashFunction: 'sha256', domainParameter: '65537', keyLength: '2048' },
// // { sigAlg: 'rsapss', hashFunction: 'sha256', domainParameter: '65537', keyLength: '3072' },
// // { sigAlg: 'rsapss', hashFunction: 'sha256', domainParameter: '3', keyLength: '3072' },
// // { sigAlg: 'rsapss', hashFunction: 'sha256', domainParameter: '3', keyLength: '4096' },
// { sigAlg: 'rsapss', hashFunction: 'sha384', domainParameter: '65537', keyLength: '3072' },
// { sigAlg: 'rsapss', hashFunction: 'sha384', domainParameter: '65537', keyLength: '4096' },



// { sigAlg: 'ecdsa', hashFunction: 'sha1', domainParameter: 'secp256r1', keyLength: '256' },
{ sigAlg: 'ecdsa', hashFunction: 'sha1', domainParameter: 'secp384r1', keyLength: '384' },
// { sigAlg: 'ecdsa', hashFunction: 'sha1', domainParameter: 'secp384r1', keyLength: '384' }, //killed
// { sigAlg: 'ecdsa', hashFunction: 'sha1', domainParameter: 'brainpoolP256r1', keyLength: '256' },



// { sigAlg: 'ecdsa', hashFunction: 'sha256', domainParameter: 'brainpoolP256r1', keyLength: '256' },
Expand Down Expand Up @@ -83,14 +117,46 @@ sigAlgs.forEach(({ sigAlg, hashFunction, domainParameter, keyLength }) => {
dscCertPem = mock_dsc_sha256_rsa_4096;
cscaCertPem = mock_csca_sha256_rsa_4096;
break;
case 'rsa_sha1_65537_2048':
dscCertPem = mock_dsc_sha1_rsa_2048;
cscaCertPem = mock_csca_sha1_rsa_2048;
break;
case 'rsa_sha1_65537_3072':
dscCertPem = mock_dsc_sha1_rsa_3072;
cscaCertPem = mock_csca_sha1_rsa_3072;
break;
case 'rsa_sha1_65537_4096':
dscCertPem = mock_dsc_sha1_rsa_4096;
cscaCertPem = mock_csca_sha1_rsa_4096;
break;
case 'rsapss_sha256_65537_2048':
dscCertPem = mock_dsc_sha256_rsapss_2048;
cscaCertPem = mock_csca_sha256_rsapss_2048;
break;
case 'rsapss_sha256_65537_3072':
dscCertPem = mock_dsc_sha256_rsapss_65537_3072;
cscaCertPem = mock_csca_sha256_rsapss_65537_3072;
break;
case 'rsapss_sha256_65537_4096':
dscCertPem = mock_dsc_sha256_rsapss_4096;
cscaCertPem = mock_csca_sha256_rsapss_4096;
break;
case 'rsapss_sha256_3_3072':
dscCertPem = mock_dsc_sha256_rsapss_3_3072;
cscaCertPem = mock_csca_sha256_rsapss_3_3072;
break;
case 'rsapss_sha256_3_4096':
dscCertPem = mock_dsc_sha256_rsapss_3_4096;
cscaCertPem = mock_csca_sha256_rsapss_3_4096;
break;
case 'rsapss_sha384_65537_3072':
dscCertPem = mock_dsc_sha384_rsapss_65537_3072;
cscaCertPem = mock_csca_sha384_rsapss_65537_3072;
break;
case 'rsapss_sha384_65537_4096':
dscCertPem = mock_dsc_sha384_rsapss_65537_4096;
cscaCertPem = mock_csca_sha384_rsapss_65537_4096;
break;
case 'ecdsa_sha1_secp256r1_256':
dscCertPem = mock_csca_sha1_secp256r1_256 //mock_dsc_sha1_secp256r1_256;
cscaCertPem = mock_csca_sha1_secp256r1_256;
Expand All @@ -99,6 +165,10 @@ sigAlgs.forEach(({ sigAlg, hashFunction, domainParameter, keyLength }) => {
dscCertPem = mock_dsc_sha1_secp384r1_384;
cscaCertPem = mock_csca_sha1_secp384r1_384;
break;
case 'ecdsa_sha1_brainpoolP256r1_256':
dscCertPem = mock_dsc_sha1_brainpoolP256r1_256
cscaCertPem = mock_csca_sha1_brainpoolP256r1_256
break;
case 'ecdsa_sha256_secp256r1_256':
dscCertPem = mock_dsc_sha256_secp256r1;
cscaCertPem = mock_csca_sha256_secp256r1;
Expand Down Expand Up @@ -143,7 +213,7 @@ sigAlgs.forEach(({ sigAlg, hashFunction, domainParameter, keyLength }) => {
const max_cert_bytes_map = {
sha1: max_cert_bytes,
sha256: max_cert_bytes,
sha384: 512,
sha384: 1024, //896, //512,
sha512: 512,
}

Expand Down
2 changes: 1 addition & 1 deletion common/pubkeys/serialized_csca_tree.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[["12318042172396531802699526811601555577688111457647491273516680975841658293190","15845949368360709366125828122875026466239168435162198575033870308768885466686","1299426777219348392543446801442034136252817996416498841464274663780016862701","5113513061523675961623475730625071643486988424262732979988786488066593989302","1987618265562200430507727542136279024124051049075264148284808346418759262604"],["17518450543384052559251874511974887263837708516491486182729806148509376664077","15493054069313996187112932517390725573659704397737912715622474554700936868391","5697262325123206250922998810427271995534337771475144569689028359300839265083"],["13601675512190535337960550324647102041409798081546358552006897713409042569179","20998208408560496096854397194530207649008575764838039629881657911650167397030"],["11797571716572588341125804920147695894064632652033966753841512102697080977409"],["13886630367341070722364047810373639739385211604206489255338014425092188779486"],["7011121312708280258581201781758389685125439628027003902369764404297076748555"],["3585925538935057429232401227698437831214778560983265898681621993236059845446"],["14502663011465079719940775681218419393713659066611994848632941018703172691793"],["4796766674511839676293998857628668411566448829313133974365981470607401345979"],["20964530964091070549253748277648129688327288695753467050135632827266919802818"],["20077084687733763809396784747659645095320741902663062120620865402654045452919"],["9174499483403290549533361594699628791165564398512222225764965278818436992555"],["3478432981378371064841149671364213694025710304282285529518218595121960177719"]]
[["19326168139194000687162817623662003872236142620705435383485855804470406473990","11895076060671184375321566922121103092547207321783300179874645573468673504031","10612986271375749634981997680304094180302709926978855498161756872508244243431","12285921680541051164247278003545252031379653586861552394602573908856910898850","12318042172396531802699526811601555577688111457647491273516680975841658293190","15845949368360709366125828122875026466239168435162198575033870308768885466686","1299426777219348392543446801442034136252817996416498841464274663780016862701","5113513061523675961623475730625071643486988424262732979988786488066593989302","1987618265562200430507727542136279024124051049075264148284808346418759262604","18507107644989988939582116050872554367281205272495212838646250939077818075264","11616055333273564324008485040250028103272150906108896166943402146219648666520","14775893181206697572166430868288754403292041514673855518087062313430973397659","21512415093280897017679066625614569026011403886442528926352793852778138112675","2487364020459570256441340081338941384722927792804879805088107865192970479252","21855164372386326408080391163163816344500348196111624972400691850567264135095","9009811087651060710612517896450075580573940671253030905793261598313911350146","7615237533504920401479763608803979665274612875365332911349035403363223009741","16293395466918413300524918511882300387659897834220585676830833034019545756634","8188859095963533892655042272342730187687968753242279400920654362828036186612","12876679216264966137946856497315357176730818454317737110851432790098180950487"],["18685330163651980366515365273156266816466543517027937299937841970840976593465","9556722486841036151963750821277876739894071762334384995008674291508461574112","17518450543384052559251874511974887263837708516491486182729806148509376664077","15493054069313996187112932517390725573659704397737912715622474554700936868391","7645594157923503563693925286462232922094712069907802554732410812889931463709","4368849592369827150076665453991771748100537788859449933207598515997677310380","7958275848813997434928479631527288740299939418884734450930737767482032254470","6269860663940582459110969490230906468188435424975001294936500555856385848474","884507074109722131154398760914532319129206155850261699770214293851930838757","11639417062650805666509922492005979083070596288101145258991023010673588270590"],["17282809042023964783201362517505720599787834143242864781044622426362451476446","13601675512190535337960550324647102041409798081546358552006897713409042569179","20906508732259468792252133137858890535850115477209900862563789775894645931987","11062310245706530267640468870380788654986546409846448870511247959172684088373","17619682643751185737724205897303363764860143491556825904140836406507271618110"],["10939341114600186831679077767275077823529389225959278737440152260523375386958","7695333069216657785748800995794281236786913084008191268405207274057557667939","11102341186119388594370130145581432160464297248827917060136197488524501729324"],["13743891314080635626315172808206526544844544149052400023363023226996622828658","4189026924546630462439983113650246780568691972730815438269988337474568082424"],["17303666057016988208172395247626456886198316177676710623079305781446544702470"],["6936044092438872824455546439687995324016809715600258444556734658876423023421"],["3917778709098661778768268622505200090036035943524500252961873115134452753215"],["5164987208281790606551966840284915270155790865610999561522165420701823753454"],["9960635863499007483725644272342387253367124640933892655716467778264093740128"],["9266830234320470982624033158078947263999570778089053238619528280132691708448"],["10439856369725511840744214376283241768653451291517832470464825432430220358717"],["12855363108617521195270796390351012589551193735669217547183537213349250933180"]]
54 changes: 54 additions & 0 deletions common/src/constants/mockCertificates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,60 @@ D2BiW2DQjX4OJsOPNs63+wCE71xj08ZxipFuxFWhbjtO/A82h6QMXYwfj9do1WGD
oouEG7wJwn8++cuiivyeTWf1
-----END PRIVATE KEY-----`;

export const mock_dsc_sha1_rsa_3072 = `-----BEGIN CERTIFICATE-----
MIIEWjCCAsKgAwIBAgIUFakTaB058BAQFTBDVs+PGHiiaC8wDQYJKoZIhvcNAQEF
BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yNTAxMDMwNzM4MTlaFw0yNjAx
MDMwNzM4MTlaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggGiMA0GCSqGSIb3DQEB
AQUAA4IBjwAwggGKAoIBgQDprLKbNPDug1oryBWVW8WKlKWE5Xci0RVd7rM/oSnz
CwnxbnqXNEXBSkCJrSCx1EerAazFtzHZfN1T1pBjVYSq2T5BOutcVqBWZKl8Tzbs
naFrn8nCJO5JHUHoEvaA28xgbcI5DTKY+7iiCNIKL+GILqySZXktOSlvgrCPcjZX
ImuYbx3jtNWhW9dsqmE4XW5HikXScXbVwXkg3Q2P1TBaOkGSSok8ytI+DV/JnY2T
nDMY9jGxD0Nh3QO5aoJdUjKt2xTsKcB7Yu6eHsA8D8WC0zlrCCfw1AGtjimsqwPp
3C9fcEsIYsHv3v/xiqNYNRBSEPYXrJBkK5sPTe/8jXRWJXRl4w9OQ1NdN+ySw5gf
VHEy6GAuKewsi3s5zufa9Tqn0YOFuMFfRRv1qDUp7am8tskBmOrhYRvonn98kCoV
aoOknc12FwO1pM0OLnMz5dxwXYm5oZPL8HbU8iJp+6jV6ZV66gLwR0cPeQ/Ci1+i
b9DRUtsU1CtBdaGMS4LW+xkCAwEAAaNCMEAwHQYDVR0OBBYEFIyZ2ogDvJG0cFST
2Bjwrf+IeQ6nMB8GA1UdIwQYMBaAFKHWMSrWyXH0Dkpk1o0LUO17l4zUMA0GCSqG
SIb3DQEBBQUAA4IBgQAMf75K3MXq12wyKeBAxHiq931T0W49K8IIBg93yP4LfWfk
sQD6B8/gy04MByoywZkCoj2qY5UYJiDRDfQhTXkqv7ZLqVm+kUW6HgWbRvR66MMP
neYehTNdpYAL9CEN5wXASjcFRy0AuQoB9wxtnbWs8o2mEW6xeEj1MVDaG65V+skU
cztqeOwLM9crf5ZB4Z5qycjbNEplC418uarTnu0VBbGOisWHz6HS0EOlat4g8b+e
dr9fLPmU2yMYwdBlf8KGnjSsHjl1j3pwnU1pgLi8xlV9MTaL2po9MwAHVzsBjqoe
nEnT9nWJVwsleBpunxKHDAGh+gKiO7gLKpDl/x4aZfXXHTxQRFmSev2SzWzpjj7v
16R3O/XgZVeSOpWKVysAgkXKCa7oeShCjmhQRCIHqIoW/DQ1ZBDtIowmsVbiTI5Y
TpU0mbeKWdMu374MHF2jL+Gw0wYva3jhxn1l1zYupY8pIm0bclw5qZoAWN1Kpe2D
6bf3G9D91jXlgcMymVk=
-----END CERTIFICATE-----`

export const mock_csca_sha1_rsa_3072 = `-----BEGIN CERTIFICATE-----
MIIEazCCAtOgAwIBAgIURKbZUF9T0hzCK/lNQqLVaao5JMEwDQYJKoZIhvcNAQEF
BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yNTAxMDMwNzM2MjhaFw0yNjAx
MDMwNzM2MjhaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggGiMA0GCSqGSIb3DQEB
AQUAA4IBjwAwggGKAoIBgQC+PyH1k/rLSZ16/aiaTOtblj6KQyPNf8LrHOjLVs1I
0Nnbzps0pcMRof3jCwCGLDePfypZ/1xO9gsUFQ8tE+BuPoil19n6Z0Xit+Wm+Z/+
bOn2MKm8gh5SXxSvpmK0e89H7yWnxzf0jT/seReYhC8z4P4QroXOotolT1H0NNmK
KDSvQ/c7/xn2Hm1NydG8aRL4qXY7KjQ7BYE+uJinXS/fJ4h3g3Z92W4MR6kZzNT4
Pbjxf9u5HWZWnBmZKZqpg4gFrsfeIuupXT2lZj6O+5Hj3CUXVn+SothhMkpS7tm9
ipLCEMwFPDMQiGEOrfZ7Z+d9gCiPJc7oawo1o5NaTkbmBUUR7t+QIgLMgfqVHUML
AusXicTKqokxcl6DX8So0bWePiouTN8qYbYrBjOhqJ2fITy3di+q3sgt+25QswId
iahd2LmmZE9LlPWKHOb8MlTpzGqScc4JfQYskEw4GDdC39Rsfk93rXlLJoFW9zAn
G60lCwl7o4+cSnjuiUWYgI8CAwEAAaNTMFEwHQYDVR0OBBYEFKHWMSrWyXH0Dkpk
1o0LUO17l4zUMB8GA1UdIwQYMBaAFKHWMSrWyXH0Dkpk1o0LUO17l4zUMA8GA1Ud
EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggGBAAC4j6xkco6t0XjvvcOQpIWw
bK9qCAnVJ2AGP1x+l59J6Hkf9nPDMR+f8pjEp+lYjqwMkcJKO74wtWh9s+MIWsmN
zfh0cJTieCKnq/eN8flOlnUsmDqQWB6kJoJKxxzD1nz++sMxh7bIpbV3yK0xQg3N
ZLpk7+cDD2e4ZwIi0yQEu6RO8yvLL63FRokAUyUVTEPkpIjRB1DT0OKJmquRUTga
dxX8aNra+d6k39lYcvoT5745P2t1zzfslIa9rcJNIqT/2gseBelekckFlAqigfhm
pxAgwhw2zUtgfIe5BmL/0lCKlqfMLjHdDtqdsmC+oDgS3Svl+tj0YAOJCULWlohJ
9KZJCXntwRSVsdBWpvv7dGYnej+2Z6UuLh36hFrMAVZc1u3wq2tnPZ/pyccBR4RI
pEE/R8mVbguBbwgNR269BlCnofqwV3060j1XWqZbM9FNHaPHYr5a9eZUbiJUFQ62
i0djWa3YnOzZnOvb6COKE6vUsqNWstpgqfacM/IVfA==
-----END CERTIFICATE-----`

export const mock_csca_sha1_rsa_4096 = `-----BEGIN CERTIFICATE-----
MIIFCTCCAvGgAwIBAgIUPfIaBL/H++x5cwbWjRnVae1VV3owDQYJKoZIhvcNAQEF
BQAwFDESMBAGA1UEAwwJbW9ja19jc2NhMB4XDTI0MDYyNzA4NDgyN1oXDTI1MDYy
Expand Down
Loading

0 comments on commit 6b98913

Please sign in to comment.