Skip to content

Commit

Permalink
[FAB-1994] - support intermediate CAs in MSP
Browse files Browse the repository at this point in the history
MSPs should support intermediate CAs to permit validation of certificate
chains longer than 2. This change set adds the relevant field to the msp
config protobuf.

Change-Id: Ia521091803e9c93536bcd5f4a0e4ca780b44a5b9
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>
  • Loading branch information
ale-linux committed Feb 8, 2017
1 parent 4978313 commit bb32aa3
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 30 deletions.
64 changes: 38 additions & 26 deletions protos/msp/mspconfig.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 16 additions & 4 deletions protos/msp/mspconfig.proto
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,31 @@ message FabricMSPConfig {
// this can refer to the Subject OU field or the Issuer OU field.
string Name = 1;

// List of root certificates associated
// List of root certificates trusted by this MSP
// they are used upon certificate validation (see
// comment for IntermediateCerts below)
repeated bytes RootCerts = 2;

// List of intermediate certificates trusted by this MSP;
// they are used upon certificate validation as follows:
// validation attempts to build a path from the certificate
// to be validated (which is at one end of the path) and
// one of the certs in the RootCerts field (which is at
// the other end of the path). If the path is longer than
// 2, certificates in the middle are searched within the
// IntermediateCerts pool
repeated bytes IntermediateCerts = 3;

// Identity denoting the administrator of this MSP
repeated bytes Admins = 3;
repeated bytes Admins = 4;

// Identity revocation list
repeated bytes RevocationList = 4;
repeated bytes RevocationList = 5;

// SigningIdentity holds information on the signing identity
// this peer is to use, and which is to be imported by the
// MSP defined before
SigningIdentityInfo SigningIdentity = 5;
SigningIdentityInfo SigningIdentity = 6;
}

// SigningIdentityInfo represents the configuration information
Expand Down

0 comments on commit bb32aa3

Please sign in to comment.