How to generate server and client certfile, keyfile？

.gitignore

@@ -3,3 +3,11 @@ build
 coverage.xml
 *.csr
 *.der
+testdata/fabric-ca-cert.pem
+testdata/fabric-ca-key.pem
+testdata/fabric*ca.db
+testdata/initFabricCaFvt.json
+testdata/openssl.cnf.base.this
+testdata/runFabricCaFvt.json
+fabric-ca
+vendor/github.com/cloudflare/cfssl/vendor/github.com/cloudflare/cfssl_trust/ca-bundle/http:*.crt

CONTRIBUTING.md

@@ -2,3 +2,5 @@
 
 This repository is part of the Fabric project.
 Please consult [Fabric's CONTRIBUTING documentation](https://github.com/hyperledger/fabric/blob/master/docs/CONTRIBUTING.md) for information on how to contribute to this repository.
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

MAINTAINERS.md

@@ -1,4 +1,6 @@
-## Maintainers
-
-This repository is part of the Fabric project.
-Please consult [Fabric's MAINTAINERS documentation](https://github.com/hyperledger/fabric/blob/master/docs/MAINTAINERS.md) for the list of people maintaining this repository.
+## Maintainers
+
+This repository is part of the Fabric project.
+Please consult [Fabric's MAINTAINERS documentation](https://github.com/hyperledger/fabric/blob/master/docs/source/MAINTAINERS.rst) for the list of people maintaining this repository.
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

Makefile

@@ -5,7 +5,7 @@
 # You may obtain a copy of the License at
 #
 #		 http://www.apache.org/licenses/LICENSE-2.0
-#
+
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,16 @@
 #
 #   - all (default) - builds all targets and runs all tests
 #   - license - check all go files for license headers
-#   - fabric-ca - builds the fabric-ca executable
+#   - fabric-ca-server - builds the fabric-ca-server executable
+#   - fabric-ca-client - builds the fabric-ca-client executable
 #   - unit-tests - Performs checks first and runs the go-test based unit tests
 #   - checks - runs all check conditions (license, format, imports, lint and vet)
-#   - ldap-tests - runs the LDAP tests
 #   - docker[-clean] - ensures all docker images are available[/cleaned]
 #   - clean - cleans the build area
 
 PROJECT_NAME   = fabric-ca
-BASE_VERSION   = 0.7.0
+BASE_VERSION   = 1.0.7
+PREV_VERSION   = 1.0.6
 IS_RELEASE     = false
 
 ifneq ($(IS_RELEASE),true)
@@ -35,20 +36,22 @@ else
 PROJECT_VERSION=$(BASE_VERSION)
 endif
 
-# Check that all dependencies are installed
-EXECUTABLES = go docker git curl
-K := $(foreach exec,$(EXECUTABLES),\
-	$(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH: Check dependencies")))
-
 ARCH=$(shell uname -m)
-BASEIMAGE_RELEASE = 0.3.0
+ifeq ($(ARCH),s390x)
+PGVER=9.4
+else
+PGVER=9.5
+endif
+
+BASEIMAGE_RELEASE = 0.3.1
 PKGNAME = github.com/hyperledger/$(PROJECT_NAME)
-SAMPLECONFIG = $(shell git ls-files images/fabric-ca/config)
 
 DOCKER_ORG = hyperledger
 IMAGES = $(PROJECT_NAME)
+FVTIMAGE = $(PROJECT_NAME)-fvt
 
-image-path-map.fabric-ca := fabric-ca
+path-map.fabric-ca-client := ./cmd/fabric-ca-client
+path-map.fabric-ca-server := ./cmd/fabric-ca-server
 
 include docker-env.mk
 
@@ -59,6 +62,11 @@ rename: .FORCE
 
 docker: $(patsubst %,build/image/%/$(DUMMY), $(IMAGES))
 
+docker-fvt: $(patsubst %,build/image/%/$(DUMMY), $(FVTIMAGE))
+
+changelog:
+	./scripts/changelog.sh v$(PREV_VERSION) HEAD v$(BASE_VERSION)
+
 checks: license vet lint format imports
 
 license: .FORCE
@@ -76,21 +84,24 @@ lint: .FORCE
 vet: .FORCE
 	@scripts/check_vet
 
-fabric-ca:
-	@echo "Building fabric-ca in bin directory ..."
-	@mkdir -p bin && go build -o bin/fabric-ca
-	@echo "Built bin/fabric-ca"
+fabric-ca-client: bin/fabric-ca-client
+fabric-ca-server: bin/fabric-ca-server
+
+bin/%:
+	@echo "Building ${@F} in bin directory ..."
+	@mkdir -p bin && go build -o bin/${@F} $(path-map.${@F})
+	@echo "Built bin/${@F}"
 
 # We (re)build a package within a docker context but persist the $GOPATH/pkg
 # directory so that subsequent builds are faster
-build/docker/bin/fabric-ca:
+build/docker/bin/%:
 	@echo "Building $@"
 	@mkdir -p $(@D) build/docker/$(@F)/pkg
 	@$(DRUN) \
 		-v $(abspath build/docker/bin):/opt/gopath/bin \
 		-v $(abspath build/docker/$(@F)/pkg):/opt/gopath/pkg \
 		hyperledger/fabric-baseimage:$(BASE_DOCKER_TAG) \
-		go install -ldflags "$(DOCKER_GO_LDFLAGS)" $(PKGNAME)
+		go install -ldflags "$(DOCKER_GO_LDFLAGS)" $(PKGNAME)/$(path-map.${@F})
 	@touch $@
 
 build/docker/busybox:
@@ -99,53 +110,61 @@ build/docker/busybox:
 		hyperledger/fabric-baseimage:$(BASE_DOCKER_TAG) \
 		make -f busybox/Makefile install BINDIR=$(@D)
 
-# payload definitions
-build/image/$(PROJECT_NAME)/payload:	build/docker/bin/fabric-ca \
-					build/sampleconfig.tar.bz2
-
-build/image/%/payload:
-	mkdir -p $@
-	cp images/fabric-ca/root.pem $@/root.pem
-	cp images/fabric-ca/tls_client-cert.pem $@/tls_client-cert.pem
-	cp images/fabric-ca/tls_client-key.pem $@/tls_client-key.pem
-	cp images/fabric-ca/ec.pem $@/ec.pem
-	cp images/fabric-ca/ec-key.pem $@/ec-key.pem
-	cp $^ $@
-
 build/image/%/$(DUMMY): Makefile build/image/%/payload
 	$(eval TARGET = ${patsubst build/image/%/$(DUMMY),%,${@}})
 	$(eval DOCKER_NAME = $(DOCKER_ORG)/$(TARGET))
 	@echo "Building docker $(TARGET) image"
-	@cat images/$(image-path-map.$(TARGET))/Dockerfile.in \
+	@cat images/$(TARGET)/Dockerfile.in \
 		| sed -e 's/_BASE_TAG_/$(BASE_DOCKER_TAG)/g' \
 		| sed -e 's/_TAG_/$(DOCKER_TAG)/g' \
+		| sed -e 's/_PGVER_/$(PGVER)/g' \
 		> $(@D)/Dockerfile
 	$(DBUILD) -t $(DOCKER_NAME) $(@D)
 	docker tag $(DOCKER_NAME) $(DOCKER_NAME):$(DOCKER_TAG)
 	@touch $@
 
-build/sampleconfig.tar.bz2: $(SAMPLECONFIG)
-	tar -jc -C images/fabric-ca/config $(patsubst images/fabric-ca/config/%,%,$(SAMPLECONFIG)) > $@
+build/image/fabric-ca/payload: \
+	build/docker/bin/fabric-ca-client \
+	build/docker/bin/fabric-ca-server \
+	build/fabric-ca.tar.bz2
+build/image/fabric-ca-fvt/payload: \
+	build/docker/bin/fabric-ca-client \
+	build/docker/bin/fabric-ca-server \
+	images/fabric-ca-fvt/base.ldif \
+	images/fabric-ca-fvt/add-users.ldif \
+	images/fabric-ca-fvt/start.sh
+build/image/%/payload:
+	@echo "Copying $^ to $@"
+	mkdir -p $@
+	cp $^ $@
 
-unit-tests: checks fabric-ca
-	@scripts/run_tests
+build/fabric-ca.tar.bz2: $(shell git ls-files images/fabric-ca/payload)
 
-container-tests: ldap-tests
+build/%.tar.bz2:
+	@echo "Building $@"
+	@tar -jc -C images/$*/payload $(notdir $^) > $@
+
+unit-tests: checks fabric-ca-server fabric-ca-client
+	@scripts/run_tests
 
-ldap-tests:
-	@scripts/run_ldap_tests
+container-tests: docker
 
 fvt-tests:
 	@scripts/run_fvt_tests
 
+ci-tests: docker-clean docker-fvt unit-tests
+	@docker run -v $(shell pwd):/opt/gopath/src/github.com/hyperledger/fabric-ca hyperledger/fabric-ca-fvt
+
 %-docker-clean:
 	$(eval TARGET = ${patsubst %-docker-clean,%,${@}})
 	-docker images -q $(DOCKER_ORG)/$(TARGET):latest | xargs -I '{}' docker rmi -f '{}'
 	-@rm -rf build/image/$(TARGET) ||:
 
-docker-clean: $(patsubst %,%-docker-clean, $(IMAGES))
+docker-clean: $(patsubst %,%-docker-clean, $(IMAGES) $(PROJECT_NAME)-fvt)
+	@rm -rf build/docker/bin/* ||:
 
 .PHONY: clean
+
 clean: docker-clean
 	-@rm -rf build bin ||: