Merge branch 'main' into eip-6780-selfdestruct

ethereum/p2p/src/test/resources/keys/README.md

@@ -40,6 +40,8 @@ All the CA keystores will be generated in `ca_certs` directory.
 
 Generate Root CA (validity 100 years)
 ~~~
+cd ca_certs
+
 export ROOT_CA_KS=root_ca.p12
 export INTER_CA_KS=inter_ca.p12
 export PARTNER1_CA_KS=partner1_ca.p12
@@ -75,7 +77,7 @@ CSR, Signing and re-import
 keytool -storepass test123 -keystore $ROOT_CA_KS -alias root_ca -exportcert -rfc > root_ca.pem
 
 keytool -storepass test123 -keystore $INTER_CA_KS -certreq -alias inter_ca \
-| keytool -storepass test123 -keystore $ROOT_CA_KS -gencert -alias root_ca \
+| keytool -storepass test123 -keystore $ROOT_CA_KS -gencert -validity 36500 -alias root_ca \
 -ext bc:c=ca:true,pathlen:1 -ext ku:c=dS,kCS,cRLs -rfc > inter_ca.pem
 
 cat root_ca.pem >> inter_ca.pem
@@ -84,11 +86,11 @@ keytool -keystore $INTER_CA_KS -importcert -alias inter_ca \
 -storepass test123 -noprompt -file ./inter_ca.pem
 
 keytool -storepass test123 -keystore $PARTNER1_CA_KS -certreq -alias partner1_ca \
-| keytool -storepass test123 -keystore $INTER_CA_KS -gencert -alias inter_ca \
+| keytool -storepass test123 -keystore $INTER_CA_KS -gencert -validity 36500 -alias inter_ca \
 -ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs -rfc > partner1_ca.pem
 
 keytool -storepass test123 -keystore $PARTNER2_CA_KS -certreq -alias partner2_ca \
-| keytool -storepass test123 -keystore $INTER_CA_KS -gencert -alias inter_ca \
+| keytool -storepass test123 -keystore $INTER_CA_KS -gencert -validity 36500 -alias inter_ca \
 -ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs -rfc > partner2_ca.pem
 
 cat root_ca.pem >> partner1_ca.pem
@@ -99,6 +101,8 @@ keytool -keystore $PARTNER1_CA_KS -importcert -alias partner1_ca \
 
 keytool -keystore $PARTNER2_CA_KS -importcert -alias partner2_ca \
 -storepass test123 -noprompt -file ./partner2_ca.pem
+
+cd ..
 ~~~
 
 ---
@@ -116,27 +120,31 @@ Modify the partner and client variables while running following commands accordi
 ## Truststore
 Create truststore for each partner and copy in appropriate client directories
 ~~~
-export OU=partner1
+cd partner2client1
+
+export OU=partner2
 
 keytool -import -trustcacerts -alias root_ca \
--file ./ca_certs/root_ca.pem -keystore truststore.p12 \
+-file ../ca_certs/root_ca.pem -keystore truststore.p12 \
 -storepass test123 -noprompt
 
 keytool -import -trustcacerts -alias inter_ca \
--file ./ca_certs/inter_ca.pem -keystore truststore.p12 \
+-file ../ca_certs/inter_ca.pem -keystore truststore.p12 \
 -storepass test123 -noprompt
 
 keytool -import -trustcacerts -alias ${OU}_ca \
--file ./ca_certs/${OU}_ca.pem -keystore truststore.p12 \
+-file ../ca_certs/${OU}_ca.pem -keystore truststore.p12 \
 -storepass test123 -noprompt
 
 ~~~
 
 Cd to appropriate client directory and generate the certificates.
-Note: The keyalg for partner1client1 is different than others
+Note: The keyalg for partner1client1 (EC) is different than others
 
 Modify the export command.
 ~~~
+cd partner1client1
+
 export OU=partner1
 export CLIENT=client1
 ~~~
@@ -159,7 +167,7 @@ keytool -genkeypair -keystore $CLIENT.p12 -storepass test123 -alias $CLIENT \
 CSR and reimport
 ~~~
 keytool -storepass test123 -keystore "$CLIENT.p12" -certreq -alias $CLIENT \
-| keytool -storepass test123 -keystore "../ca_certs/${OU}_ca.p12" -gencert -alias ${OU}_ca \
+| keytool -storepass test123 -keystore "../ca_certs/${OU}_ca.p12" -gencert -validity 36500 -alias ${OU}_ca \
 -ext ku:c=digitalSignature,nonRepudiation,keyEncipherment -ext eku=sA,cA -rfc > "$CLIENT.pem"
 
 cat ../ca_certs/root_ca.pem >> $CLIENT.pem

ethereum/p2p/src/test/resources/keys/crl/crl.pem

@@ -1,24 +1,24 @@
 -----BEGIN X509 CRL-----
-MIIBxDCBrQIBATANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDExRwYXJ0bmVyMS5j
-YS5iZXN1LmNvbRcNMjMwMjAyMDEyOTIyWhcNMjQwMjAyMDEyOTI4WjAXMBUCBEn+
-j9gXDTIzMDIwMjAxMjkyMlqgQTA/MB8GA1UdIwQYMBaAFBIuwtMGbq3lv8zRoPbk
-RVU3C7+cMBwGA1UdFAQVAhNj2xH4Eap56JBF7NBDmVvkj4otMA0GCSqGSIb3DQEB
-CwUAA4IBAQAsMhdgnStf7oA0NpamCprGZ8AZMzbQbfFRe0C1j/BC2UCbziLXyn5o
-wEAz/2XHjbiEOW5/ocJHvZVwMCAB14gjQ9weLmIDzpkDSepnrH0EfLPM8zHmEElM
-nDN3L8f0z7fbk1zzpTcWfUSs7T5WYkrJLpwEZjXgbMFtR/YpjzFCWu1er54B78sL
-CRxit3+/y52bT4wCRyew2w8E0TAA023IRyPnFPetGy1EoBSyENSf29dwZS1X5Bmm
-OVUCpN9eGMGIgzEimhqhn1xRWvJ8sZ1xSvLO8ztW3gjtAGfmq3kUnQQLBq9iitCt
-yzPPZzL7zUQ3UCIl6n268dgrvO7XQdJK
+MIIByzCBtAIBATANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDExRwYXJ0bmVyMS5j
+YS5iZXN1LmNvbRcNMjMwNTA0MDAyMDM5WhgPMjEyMzA0MTAwMDIwNTZaMBwwGgIJ
+APbTXO0zb7GDFw0yMzA1MDQwMDIwMzlaoEEwPzAfBgNVHSMEGDAWgBSCofgh9oBV
+KID1yPbGjPcLeWXBPTAcBgNVHRQEFQITZFL6aBXe4ICyYE9gj7VI3UG6vzANBgkq
+hkiG9w0BAQsFAAOCAQEAYWoZ8V3csO+RrnwqRdtWBhYHxYxbq3W/3zT/Plrq+6ga
+47jRihxc1ZbvXPsfNpFND2eSCCBp9Jx6C8ExOhXmJhESfMwwty67APx4iLSJVC9q
+QN/BZwvak9XFJrwWqCUvEZO7of5wtgcS78SlVMPxCWkgIbvI/jhfXU2sTPRGRMuo
+Vg8WTr5eZK00h51CAYG1cf6ePRCm9FNPOae8XZ/4O9EEB9A+L+ROhn8XVF8jMJCp
+teRkieEPdcom/Sx+xpZJ3VrnQyjl6g5zSJhyHcgk1P1JpYwiZsjeTUjnBZlesv/I
+d4oNajmtcvpON2guMvAurte76UxKNQzA/WqFBcx64g==
 -----END X509 CRL-----
 -----BEGIN X509 CRL-----
-MIIBxDCBrQIBATANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDExRwYXJ0bmVyMi5j
-YS5iZXN1LmNvbRcNMjMwMjAyMDEyOTI5WhcNMjQwMjAyMDEyOTMxWjAXMBUCBGNz
-oxQXDTIzMDIwMjAxMjkyOVqgQTA/MB8GA1UdIwQYMBaAFD9/xcIxAL/W332b3jmJ
-/oCeelKZMBwGA1UdFAQVAhNj2xH7OlhXIEZ9qsmcOEjl+WQCMA0GCSqGSIb3DQEB
-CwUAA4IBAQCFgGbrw0K8w/qS4TF5qNx5zbjIQ/cH5aZ89iRn8fq7CvYH0gwJmp3b
-Eu0l2FP+Lqod1HiUN90hePDV+rhYqsJQ9f03oYOQKJZ7b7QHvgVENwXmVr/CgWnU
-qn00scsT4SDm/lXxFu8Lb0JaR58z/mRisZMmDBPx5JFBlbt6HZNN1EYD8lMpu02I
-aI7+KHIIRWYgRgi0yGYo74GfO/ER+PozTr755W7UTgdlYu4sPEcPrFidoLVycEoe
-a0N79gZ3X6pgSoIhghrAp3MxP2xCeMBQrht96Y2CBsTtUBrrQoyX+u1UkwI7FO1u
-WDJulTIKBHKXffd1bMOcQEEfsY4/2ZO9
+MIIByzCBtAIBATANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDExRwYXJ0bmVyMi5j
+YS5iZXN1LmNvbRcNMjMwNTA0MDAyMTQwWhgPMjEyMzA0MTAwMDIxNDdaMBwwGgIJ
+AIV9jGkel7fHFw0yMzA1MDQwMDIxNDBaoEEwPzAfBgNVHSMEGDAWgBSKvDdJ/ptO
+koPxFZ9+fMA+O18GXzAcBgNVHRQEFQITZFL6my0yNKi8/pYIAwy5QU+swjANBgkq
+hkiG9w0BAQsFAAOCAQEAB139q1PbVPh01yvDNZGb2ymhSAs8ZUS7RkoC8R+iBvf7
+9qvRjoO3KcpKxssGtk/pRxgkGIPin6AoXMgbNILayM0fxCwXOGbrwLS81RLEeQMh
+Jx4HLXpyTJH56cQd1F9m+yZattXBEJHybS+XXzkNEyPINvgkYXnF9vSWzXhj8ImA
+Chm10J/c5tGKCzoFbEPDxvsduJmyyEnIk+OdM7bfAPVppSImcQYv4Q586RPdJEaS
+p+gSgOlM0PebJpSzauaPEfWVem6qG/w3lCEpRtqA5J8LrB23VfOn+r6MsRzq1xf2
+I2PKF8tgGzGTEth1PAgMGHKe685hbfuqFdOkz0eV6A==
 -----END X509 CRL-----