Skip to content

Commit

Permalink
FAB-4572 add missing license headers
Browse files Browse the repository at this point in the history
Change-Id: I4ba145091fb18f470b77a9707735a8c0acf9498c
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
  • Loading branch information
christo4ferris committed Jun 12, 2017
1 parent 1424b33 commit 989b563
Show file tree
Hide file tree
Showing 29 changed files with 148 additions and 13 deletions.
3 changes: 3 additions & 0 deletions docs/make.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
REM Copyright IBM Corp. All Rights Reserved.
REM SPDX-License-Identifier: Apache-2.0

@ECHO OFF

pushd %~dp0
Expand Down
5 changes: 5 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
python-markdown-math==0.2

alabaster==0.7.8
Expand Down
5 changes: 5 additions & 0 deletions docs/source/_static/css/custom.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
*/
@import "theme.css";

/* Highlights */
Expand Down
5 changes: 5 additions & 0 deletions docs/source/_templates/layout.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<!--
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
-->
{% extends "!layout.html" %}
{% block sidebartitle %}
{{ super() }}
Expand Down
4 changes: 4 additions & 0 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# -*- coding: utf-8 -*-
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
# hyperledger-fabric-ca documentation build configuration file, created by
# sphinx-quickstart on Tue May 23 17:35:49 2017.
#
Expand Down
5 changes: 5 additions & 0 deletions docs/source/custom_theme/searchbox.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<!--
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
-->
<div role="search">
<form id ="rtd-search-form-alt" class="wy-form" action="{{ base_url }}/search.html" method="get">
<input type="text" name="q" placeholder="Search docs" />
Expand Down
5 changes: 5 additions & 0 deletions images/fabric-ca-fvt/Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
FROM hyperledger/fabric-baseimage:_BASE_TAG_

ENV DEBIAN_FRONTEND noninteractive
Expand Down
6 changes: 5 additions & 1 deletion images/fabric-ca-fvt/add-users.ldif
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
# User group
dn: cn=admin,ou=fabric,dc=hyperledeger,dc=example,dc=com
cn: admin
Expand Down Expand Up @@ -272,4 +277,3 @@ mail: testUser3@hyperledeger.example.com
loginShell: /bin/bash
homeDirectory: /home/testUser3
userPassword: testUser3pw

5 changes: 5 additions & 0 deletions images/fabric-ca-fvt/base.ldif
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
dn: dc=hyperledeger,dc=example,dc=com
objectClass: top
objectClass: domain
Expand Down
5 changes: 5 additions & 0 deletions images/fabric-ca/Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
FROM hyperledger/fabric-baseos:_BASE_TAG_
ENV FABRIC_CA_HOME /etc/hyperledger/fabric-ca-server
RUN mkdir -p $FABRIC_CA_HOME /var/hyperledger/fabric-ca-server
Expand Down
5 changes: 5 additions & 0 deletions scripts/add-user.ldif
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
# User primary group
dn: cn=jsmith,dc=example,dc=org
cn: jsmith
Expand Down
6 changes: 5 additions & 1 deletion scripts/bash_profile
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
# This file contains useful functions for fabric development.
# Modify the following environment variables as desired.
# The remaining variables should not need to be change.
Expand Down
6 changes: 5 additions & 1 deletion scripts/check_format
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
echo "Checking file format ..."
found=`gofmt -l \`find . -name "*.go" |grep -v "./vendor"\` 2>&1`
if [ $? -ne 0 ]; then
Expand Down
6 changes: 5 additions & 1 deletion scripts/check_imports
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
if [ ! -f $GOPATH/bin/goimports ]; then
echo "Installing goimports ..."
go get golang.org/x/tools/cmd/goimports
Expand Down
5 changes: 5 additions & 0 deletions scripts/check_license
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/bin/bash
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#

echo "Checking Go files for license headers ..."
missing=`grep -l -L "Apache License" \`find . -name "*.go"\` |grep -v "./vendor"`
Expand Down
6 changes: 5 additions & 1 deletion scripts/check_lint
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
function runlint {
for dir in `ls`
do
Expand Down
6 changes: 5 additions & 1 deletion scripts/check_test_results
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
if [ $# -ne 1 ]; then
echo "Usage: check_test_results <results-file>"
exit 1
Expand Down
5 changes: 5 additions & 0 deletions scripts/check_vet
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/bin/bash
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
function runvet {
{
for dir in `ls`
Expand Down
5 changes: 5 additions & 0 deletions scripts/rename-repo
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/bin/sh
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
OLD=$GOPATH/src/github.com/hyperledger/fabric-cop
NEW=$GOPATH/src/github.com/hyperledger/fabric-ca
if [ -d "$NEW" ]; then
Expand Down
5 changes: 5 additions & 0 deletions scripts/run_fvt_tests
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/bin/bash
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
FABRIC_CA=$GOPATH/src/github.com/hyperledger/fabric-ca
SCRIPTDIR="$FABRIC_CA/scripts/fvt"
. $SCRIPTDIR/fabric-ca_utils
Expand Down
6 changes: 5 additions & 1 deletion scripts/run_tests
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
FCA=$GOPATH/src/github.com/hyperledger/fabric-ca

echo "Running all tests ..."
Expand Down
5 changes: 5 additions & 0 deletions testdata/ca/intermediateca/ca1/fabric-ca-server-config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
# #############################################################################
# The CA section contains information specific to this Certificate Authority.
# Minimally, the name must be unique for all CAs serviced by the same server.
Expand Down
5 changes: 5 additions & 0 deletions testdata/ca/intermediateca/ca2/fabric-ca-server-config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
#############################################################################
# The CA section contains information specific to this Certificate Authority.
# Minimally, the name must be unique for all CAs serviced by the same server.
Expand Down
5 changes: 5 additions & 0 deletions testdata/ca/rootca/ca1/fabric-ca-server-config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
#############################################################################
# The CA section contains information specific to this Certificate Authority.
# Minimally, the name must be unique for all CAs serviced by the same server.
Expand Down
5 changes: 5 additions & 0 deletions testdata/ca/rootca/ca2/fabric-ca-server-config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
# #############################################################################
# The CA section contains information specific to this Certificate Authority.
# Minimally, the name must be unique for all CAs serviced by the same server.
Expand Down
5 changes: 5 additions & 0 deletions testdata/ca/rootca/ca3/fabric-ca-server-config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
# #############################################################################
# The CA section contains information specific to this Certificate Authority.
# Minimally, the name must be unique for all CAs serviced by the same server.
Expand Down
5 changes: 5 additions & 0 deletions testdata/fabric-ca-client-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
#############################################################################
# This is a configuration file for the fabric-ca-client command.
#
Expand Down
17 changes: 11 additions & 6 deletions testdata/openssl.cnf.base
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
#HOME = .
#RANDFILE = $ENV::HOME/.rnd
DOMAIN = FVT
Expand Down Expand Up @@ -90,7 +95,7 @@ attributes = req_attributes # req attributes
x509_extensions = v3_ca # The extentions to add to self signed certs
req_extensions = v3_req # The extensions to add to req's

# This sets a mask for permitted string types. There are several options.
# This sets a mask for permitted string types. There are several options.
# default: PrintableString, T61String, BMPString.
# pkix : PrintableString, BMPString.
# utf8only: only UTF8Strings.
Expand Down Expand Up @@ -177,7 +182,7 @@ keyUsage = $KEYUSE
# ipsecEndSystem -- obsolete
# ipsecTunnel -- obsolete
# ipsecUser -- obsolete
# timeStamping
# timeStamping
# OCSPSigning
#extendedKeyUsage = $EXTKEYUSE

Expand All @@ -191,7 +196,7 @@ authorityKeyIdentifier=keyid,issuer
# An alternative to produce certificates that aren't
# deprecated according to PKIX.
#subjectAltName=email:move
subjectAltName=$SUBALT
subjectAltName=$SUBALT

####################################################################
# Same as above, but cert req already has SubjectAltNames
Expand All @@ -216,7 +221,7 @@ keyUsage = $KEYUSE
# Lets at least make our requests PKIX complaint
#subjectAltName=email:move

subjectAltName=$SUBALT
subjectAltName=$SUBALT

####################################################################
# subjectAltName section
Expand Down Expand Up @@ -264,7 +269,7 @@ crlDistributionPoints=cdp_section
subjectKeyIdentifier=hash
authorityKeyIdentifier=keyid:always,issuer:always
basicConstraints = critical,CA:true
#basicConstraints = CA:true
#basicConstraints = CA:true
keyUsage = cRLSign, keyCertSign
# nsCertType = sslCA, emailCA
# Copy issuer details
Expand All @@ -285,7 +290,7 @@ fullname=URI:http://localhost:$HTTP_PORT/$DOMAIN/crl/crl.der

[ cdp_section ]
fullname=URI:http://localhost:$HTTP_PORT/$DOMAIN/crl/crl.der
# revocation reason, where reason is one of:
# revocation reason, where reason is one of:
# unspecified
# keyCompromise
# CACompromise
Expand Down
5 changes: 5 additions & 0 deletions testdata/testviperunmarshal.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
ca:
name: test

Expand Down

0 comments on commit 989b563

Please sign in to comment.