Skip to content

Commit 96a137a

Browse files
cendhucendhu
authored
Regenerate Orgs Crypto (#19)
#### Type of change - Bug fix #### Description This PR regenerates crypto materials for Org1 and Org2. #### Related issues - resolves #18 Signed-off-by: senthil <[email protected]>
1 parent 518796f commit 96a137a

File tree

97 files changed

+691
-714
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+691
-714
lines changed

‎internaltools/configtxgen/tools_test.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ import (
99
"github.com/hyperledger/fabric-lib-go/bccsp/factory"
1010
"github.com/stretchr/testify/require"
1111

12+
"github.com/hyperledger/fabric-x-common/common/channelconfig"
1213
"github.com/hyperledger/fabric-x-common/core/config/configtest"
1314
"github.com/hyperledger/fabric-x-common/internaltools/configtxgen/genesisconfig"
15+
"github.com/hyperledger/fabric-x-common/protoutil"
1416
)
1517

1618
func TestInspectMissing(t *testing.T) {
@@ -168,5 +170,16 @@ func TestFabricXGenesisBlock(t *testing.T) {
168170
armaPath := filepath.Join(configtest.GetDevConfigDir(), "arma_shared_config.pbbin")
169171
config.Orderer.Arma.Path = armaPath
170172
require.NoError(t, DoOutputBlock(config, "foo", blockDest))
173+
174+
configBlock, err := ReadBlock(blockDest)
175+
require.NoError(t, err)
176+
require.NotNil(t, configBlock)
177+
178+
envelope, err := protoutil.ExtractEnvelope(configBlock, 0)
179+
require.NoError(t, err)
180+
require.NotNil(t, envelope)
181+
bundle, err := channelconfig.NewBundleFromEnvelope(envelope, factory.GetDefault())
182+
require.NoError(t, err)
183+
require.NotNil(t, bundle)
171184
}
172185
}

‎sampleconfig/crypto/Org1/ca/ca.Org1-cert.pem‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICIjCCAcegAwIBAgIQfDC5wUcqTRjn1lHI/UufljAKBggqhkjOPQQDAjBbMQsw
2+
MIICITCCAcegAwIBAgIQHi91U7hLvZejEDdUcbCmlDAKBggqhkjOPQQDAjBbMQsw
33
CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
4-
YW5jaXNjbzENMAsGA1UEChMET3JnMTEQMA4GA1UEAxMHY2EuT3JnMTAeFw0yNTA5
5-
MTExNDEwMDBaFw0zNTA5MDkxNDEwMDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQI
4+
YW5jaXNjbzENMAsGA1UEChMET3JnMTEQMA4GA1UEAxMHY2EuT3JnMTAeFw0yNTEw
5+
MjcxMzU1MDBaFw0zNTEwMjUxMzU1MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQI
66
EwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRP
77
cmcxMRAwDgYDVQQDEwdjYS5PcmcxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
8-
BbzUrmuxTj+7EIjqwb2qWeeL6nZssBpGYLq4lMclICz5Kzl+S2xvw+wR5RHEbKrA
9-
IlrrbflTMsHTBuQwfbo/TaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG
10-
CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCD3
11-
RB595W2V/OcO0caCe/qmlTEkSZifzFWaI3OP9AmqLzAKBggqhkjOPQQDAgNJADBG
12-
AiEAr/d8FJi4DSscDL4sxFPoVevfhV/Wv8ii/cIWP6qhCg0CIQCOH+oGgCsQaSKc
13-
WvrW8wg6JRN8cRzO6vYgvefkfIcA9Q==
8+
w1dCMdSFzfmDDGFLpUvt6HwNeNiQetQ3wic6dJLcEDw7wxRyY1/iSC8viKjK4CkJ
9+
TLV8L8333aoZi6u2Vcmd46NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG
10+
CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBD
11+
JEKnlLukpdM83/JN8l5gaxOyfyEHXRZq9WM15OyELjAKBggqhkjOPQQDAgNIADBF
12+
AiAD4OIYQBOcBRu/B/KflBEJl79zNw6UI3RnvJK3HYyb0wIhAPOLh9MRXaFuQIEX
13+
J5TMi30UuLwQT0CXAJz+yrzRKZia
1414
-----END CERTIFICATE-----

‎sampleconfig/crypto/Org1/ca/priv_sk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-----BEGIN PRIVATE KEY-----
2-
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgq5a5L833c7gDDk/O
3-
CtDMo4vwA+jiITs9zEllt1gFHxGhRANCAAQFvNSua7FOP7sQiOrBvapZ54vqdmyw
4-
GkZguriUxyUgLPkrOX5LbG/D7BHlEcRsqsAiWutt+VMywdMG5DB9uj9N
2+
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg67jEvpqALaLAfJSt
3+
+4amQZK9iD1jzNuY2wBIHRh/3cWhRANCAATDV0Ix1IXN+YMMYUulS+3ofA142JB6
4+
1DfCJzp0ktwQPDvDFHJjX+JILy+IqMrgKQlMtXwvzffdqhmLq7ZVyZ3j
55
-----END PRIVATE KEY-----

‎sampleconfig/crypto/Org1/msp/admincerts/[email protected]‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICBjCCAaygAwIBAgIRALjTHFpimOqNVPthSX6lX74wCgYIKoZIzj0EAwIwWzEL
2+
MIIB9jCCAZygAwIBAgIRAMlMpdhU4I5ubiLPacjBRqAwCgYIKoZIzj0EAwIwWzEL
33
MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
4-
cmFuY2lzY28xDTALBgNVBAoTBE9yZzExEDAOBgNVBAMTB2NhLk9yZzEwHhcNMjUw
5-
OTExMTM0NDAwWhcNMzUwOTA5MTM0NDAwWjBfMQswCQYDVQQGEwJVUzETMBEGA1UE
6-
CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEOMAwGA1UECxMF
7-
YWRtaW4xEzARBgNVBAMMCkFkbWluQE9yZzEwWTATBgcqhkjOPQIBBggqhkjOPQMB
8-
BwNCAARbt9dxrNwpNpwK1RJm0lGib2jFHJOsr0uSjuBMBxwvIRD2TuHi7Q7qVRW9
9-
JguBiSbVDPzCTI85qiCoL7ZEajU5o00wSzAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0T
10-
AQH/BAIwADArBgNVHSMEJDAigCD1SZBFaDPPkhF+1R2sYfxLDbftUhvllYJpPyPH
11-
Bmq2dzAKBggqhkjOPQQDAgNIADBFAiEA0ZPbuOk5rW0GQxQ7sjA/ZdfPKf/x/GG/
12-
nMBcrPQCIYsCIFE0rA3vcTppoJdElZjUWaF44o7vbz//J/ok+DdGXMIv
4+
cmFuY2lzY28xDTALBgNVBAoTBE9yZzExEDAOBgNVBAMTB2NhLk9yZzEwHhcNMjUx
5+
MDI3MTM1NTAwWhcNMzUxMDI1MTM1NTAwWjBPMQswCQYDVQQGEwJVUzETMBEGA1UE
6+
CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzETMBEGA1UEAwwK
7+
QWRtaW5AT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDP2dOKMmJneDhER
8+
Otmghra8RvKQ4AjX93E3ro3CSsgodRVmWNiTht93XZSGdzCYdSZYuN8fFsSueC3s
9+
N96QQOujTTBLMA4GA1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQk
10+
MCKAIEMkQqeUu6Sl0zzf8k3yXmBrE7J/IQddFmr1YzXk7IQuMAoGCCqGSM49BAMC
11+
A0gAMEUCIQD92udeE3+Y/nObTqdnemAsL7DWaNckeoUZ/cWpGd7flgIgZBAWxJQN
12+
h6aW5f1YMFoEbniRcInJGSfrs8FTejQ6zgo=
1313
-----END CERTIFICATE-----

‎sampleconfig/crypto/Org1/msp/cacerts/ca.Org1-cert.pem‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICIjCCAcegAwIBAgIQfDC5wUcqTRjn1lHI/UufljAKBggqhkjOPQQDAjBbMQsw
2+
MIICITCCAcegAwIBAgIQHi91U7hLvZejEDdUcbCmlDAKBggqhkjOPQQDAjBbMQsw
33
CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
4-
YW5jaXNjbzENMAsGA1UEChMET3JnMTEQMA4GA1UEAxMHY2EuT3JnMTAeFw0yNTA5
5-
MTExNDEwMDBaFw0zNTA5MDkxNDEwMDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQI
4+
YW5jaXNjbzENMAsGA1UEChMET3JnMTEQMA4GA1UEAxMHY2EuT3JnMTAeFw0yNTEw
5+
MjcxMzU1MDBaFw0zNTEwMjUxMzU1MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQI
66
EwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRP
77
cmcxMRAwDgYDVQQDEwdjYS5PcmcxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
8-
BbzUrmuxTj+7EIjqwb2qWeeL6nZssBpGYLq4lMclICz5Kzl+S2xvw+wR5RHEbKrA
9-
IlrrbflTMsHTBuQwfbo/TaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG
10-
CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCD3
11-
RB595W2V/OcO0caCe/qmlTEkSZifzFWaI3OP9AmqLzAKBggqhkjOPQQDAgNJADBG
12-
AiEAr/d8FJi4DSscDL4sxFPoVevfhV/Wv8ii/cIWP6qhCg0CIQCOH+oGgCsQaSKc
13-
WvrW8wg6JRN8cRzO6vYgvefkfIcA9Q==
8+
w1dCMdSFzfmDDGFLpUvt6HwNeNiQetQ3wic6dJLcEDw7wxRyY1/iSC8viKjK4CkJ
9+
TLV8L8333aoZi6u2Vcmd46NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG
10+
CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBD
11+
JEKnlLukpdM83/JN8l5gaxOyfyEHXRZq9WM15OyELjAKBggqhkjOPQQDAgNIADBF
12+
AiAD4OIYQBOcBRu/B/KflBEJl79zNw6UI3RnvJK3HYyb0wIhAPOLh9MRXaFuQIEX
13+
J5TMi30UuLwQT0CXAJz+yrzRKZia
1414
-----END CERTIFICATE-----

‎sampleconfig/crypto/Org1/msp/config.yaml‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎sampleconfig/crypto/Org1/msp/tlscacerts/tlsca.Org1-cert.pem‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICKDCCAc2gAwIBAgIQVew0Kv86ZfleZq1d6iZA8DAKBggqhkjOPQQDAjBeMQsw
2+
MIICJzCCAc2gAwIBAgIQe4CCcJkrx5O4n1RWcv7gNzAKBggqhkjOPQQDAjBeMQsw
33
CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
44
YW5jaXNjbzENMAsGA1UEChMET3JnMTETMBEGA1UEAxMKdGxzY2EuT3JnMTAeFw0y
5-
NTA5MTExNDEwMDBaFw0zNTA5MDkxNDEwMDBaMF4xCzAJBgNVBAYTAlVTMRMwEQYD
5+
NTEwMjcxMzU1MDBaFw0zNTEwMjUxMzU1MDBaMF4xCzAJBgNVBAYTAlVTMRMwEQYD
66
VQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQK
77
EwRPcmcxMRMwEQYDVQQDEwp0bHNjYS5PcmcxMFkwEwYHKoZIzj0CAQYIKoZIzj0D
8-
AQcDQgAEe7IgoDDZWjYWTmXFDx8lCU2ccZSi0a+ooCISFb74qWloGmbBADaoKOP3
9-
Z4lfqq3oFrRik3iL/WjHG5OBZUCCo6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud
8+
AQcDQgAEG1sSFQOOTmGbFiLPJ7OEa3Wm739NYWcRkOkSSIZSsptEcA9KRbHL269d
9+
VaT0QucqFO+odxL77zCmlVQhOW3j5qNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud
1010
JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud
11-
DgQiBCDft0okk7GURVap0det427oT81rKtrxUc75MhkJoVb6JDAKBggqhkjOPQQD
12-
AgNJADBGAiEAg1N031yYIXw9i2qmTXhPdHjMi2VNhYVbGpCaKTKZWvQCIQDrwkpy
13-
lvxBuozGS5YgDT6RPU8c7512gZ17YFB4JT5ylw==
11+
DgQiBCBykuu8uw8Q0QsKxKymPFoc2mPJvNipVa2jKk0sj23/MDAKBggqhkjOPQQD
12+
AgNIADBFAiAPp51z6jc8PZYfaoPKoquGzoMIKS9ZpCNoOxtRdCVTSQIhAIvGFxP+
13+
GnywkQmb7MEBgasFl4nn8DB7su0MWRq6JtaJ
1414
-----END CERTIFICATE-----

‎sampleconfig/crypto/Org1/tlsca/priv_sk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-----BEGIN PRIVATE KEY-----
2-
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgQMlQv9Sh5t2CEydJ
3-
Ed7RYS2m6Up+cioZG39CNdqWmPmhRANCAAR7siCgMNlaNhZOZcUPHyUJTZxxlKLR
4-
r6igIhIVvvipaWgaZsEANqgo4/dniV+qregWtGKTeIv9aMcbk4FlQIKj
2+
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgRKMwD2C3Dgoe6Aj1
3+
2j2vpNNQcYPHJHzZU8scGDc1dnehRANCAAQbWxIVA45OYZsWIs8ns4Rrdabvf01h
4+
ZxGQ6RJIhlKym0RwD0pFscvbr11VpPRC5yoU76h3EvvvMKaVVCE5bePm
55
-----END PRIVATE KEY-----

‎sampleconfig/crypto/Org1/tlsca/tlsca.Org1-cert.pem‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICKDCCAc2gAwIBAgIQVew0Kv86ZfleZq1d6iZA8DAKBggqhkjOPQQDAjBeMQsw
2+
MIICJzCCAc2gAwIBAgIQe4CCcJkrx5O4n1RWcv7gNzAKBggqhkjOPQQDAjBeMQsw
33
CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
44
YW5jaXNjbzENMAsGA1UEChMET3JnMTETMBEGA1UEAxMKdGxzY2EuT3JnMTAeFw0y
5-
NTA5MTExNDEwMDBaFw0zNTA5MDkxNDEwMDBaMF4xCzAJBgNVBAYTAlVTMRMwEQYD
5+
NTEwMjcxMzU1MDBaFw0zNTEwMjUxMzU1MDBaMF4xCzAJBgNVBAYTAlVTMRMwEQYD
66
VQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQK
77
EwRPcmcxMRMwEQYDVQQDEwp0bHNjYS5PcmcxMFkwEwYHKoZIzj0CAQYIKoZIzj0D
8-
AQcDQgAEe7IgoDDZWjYWTmXFDx8lCU2ccZSi0a+ooCISFb74qWloGmbBADaoKOP3
9-
Z4lfqq3oFrRik3iL/WjHG5OBZUCCo6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud
8+
AQcDQgAEG1sSFQOOTmGbFiLPJ7OEa3Wm739NYWcRkOkSSIZSsptEcA9KRbHL269d
9+
VaT0QucqFO+odxL77zCmlVQhOW3j5qNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud
1010
JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud
11-
DgQiBCDft0okk7GURVap0det427oT81rKtrxUc75MhkJoVb6JDAKBggqhkjOPQQD
12-
AgNJADBGAiEAg1N031yYIXw9i2qmTXhPdHjMi2VNhYVbGpCaKTKZWvQCIQDrwkpy
13-
lvxBuozGS5YgDT6RPU8c7512gZ17YFB4JT5ylw==
11+
DgQiBCBykuu8uw8Q0QsKxKymPFoc2mPJvNipVa2jKk0sj23/MDAKBggqhkjOPQQD
12+
AgNIADBFAiAPp51z6jc8PZYfaoPKoquGzoMIKS9ZpCNoOxtRdCVTSQIhAIvGFxP+
13+
GnywkQmb7MEBgasFl4nn8DB7su0MWRq6JtaJ
1414
-----END CERTIFICATE-----

‎sampleconfig/crypto/Org1/users/Admin@Org1/msp/admincerts/[email protected]‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIB9jCCAZygAwIBAgIRAMlMpdhU4I5ubiLPacjBRqAwCgYIKoZIzj0EAwIwWzEL
3+
MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
4+
cmFuY2lzY28xDTALBgNVBAoTBE9yZzExEDAOBgNVBAMTB2NhLk9yZzEwHhcNMjUx
5+
MDI3MTM1NTAwWhcNMzUxMDI1MTM1NTAwWjBPMQswCQYDVQQGEwJVUzETMBEGA1UE
6+
CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzETMBEGA1UEAwwK
7+
QWRtaW5AT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDP2dOKMmJneDhER
8+
Otmghra8RvKQ4AjX93E3ro3CSsgodRVmWNiTht93XZSGdzCYdSZYuN8fFsSueC3s
9+
N96QQOujTTBLMA4GA1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQk
10+
MCKAIEMkQqeUu6Sl0zzf8k3yXmBrE7J/IQddFmr1YzXk7IQuMAoGCCqGSM49BAMC
11+
A0gAMEUCIQD92udeE3+Y/nObTqdnemAsL7DWaNckeoUZ/cWpGd7flgIgZBAWxJQN
12+
h6aW5f1YMFoEbniRcInJGSfrs8FTejQ6zgo=
13+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)