Skip to content

Commit

Permalink
[FAB-6354] Properly log x509 certs - take II
Browse files Browse the repository at this point in the history
https://gerrit.hyperledger.org/r/#/c/12439/7/msp/identities.go removed
the fix of https://gerrit.hyperledger.org/r/#/c/12321/

Now the bccsp msp once again logs certificates as:
^F^H*�H�=^D^C^B0s1^K0   ^F^CU^D^F^S^BUS1^S0^Q^F^CU^D^H^S
California1^V0^T^F^CU^D^G^S^MSan Francisco1^Y0^W^F^CU^D
^S^Porg2.example.com1^\0^Z^F^CU^D^C^S^Sca.org2.example.com0^^^W^M1709291944
California1^V0^T^F^CU^D^G^S^MSan Francisco1^_0^]^F^CU^D^C^S^Vpeer1.org2.example.com
0Y0^S^F^G*�H�=^B^A^F^H*�H�=^C^A^G^CB^@^D���|^@^Va&y^\+~��^T�
������P'WOJ�^S�n��^\��Vd�T�^F^C�[ITkY�B.z�D��P����\�M0K0^N^F^C
^F^H*�H�=^D^C^B0s1^K0   ^F^CU^D^F^S^BUS1^S0^Q^F^CU^D^H^S

After the fix it logs:
-----BEGIN CERTIFICATE-----
MIICGjCCAcCgAwIBAgIRAMvPRMUfBLYtm3vd0BCAEDIwCgYIKoZIzj0EAwIwczEL
MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh
Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTcwOTI5MTk1MjEzWhcNMjcwOTI3MTk1MjEz
WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN
U2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjEub3JnMi5leGFtcGxlLmNvbTBZ
MBMGByqGSM49AgEGCCqGSM49AwEHA0IABEZH+FfZIFKFgy2JIxfQN537Mtduir3c
K14yqfBrwNpwxNTYbCwwLbLHBNSVajEdliXzO6IV4+NLuRkBg6oRJ1OjTTBLMA4G
A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIFaaXIo4XU88
3LTPkTd/k4skqUCnV4fgB4FQnTI46QmrMAoGCCqGSM49BAMCA0gAMEUCIQCrUGYo
qkabQJrE1v+f6QTr8AMpoqdmuGeLXKBSYkhNrAIgMnKivxRi8/Z1mNj5c3jtkMCB
HhIqitq/80+9d7+nRVM=
-----END CERTIFICATE-----

Change-Id: Ic98fde5eed802afe6c29bbcbd6b489612eddf795
Signed-off-by: yacovm <yacovm@il.ibm.com>
  • Loading branch information
yacovm committed Sep 29, 2017
1 parent a945767 commit 8a4c1f4
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion msp/identities.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ type identity struct {
}

func newIdentity(cert *x509.Certificate, pk bccsp.Key, msp *bccspmsp) (Identity, error) {
mspIdentityLogger.Debugf("Creating identity instance for cert %s", cert)
if mspIdentityLogger.IsEnabledFor(logging.DEBUG) {
mspIdentityLogger.Debugf("Creating identity instance for cert %s", certToPEM(cert))
}

// Sanitize first the certificate
cert, err := msp.sanitizeCert(cert)
Expand Down

0 comments on commit 8a4c1f4

Please sign in to comment.