Skip to content

Commit

Permalink
Merge pull request #1 from ThalesIgnite/add_vendoring
Browse files Browse the repository at this point in the history
Adding vendoring via dep, and updated README.md
  • Loading branch information
Richard Kettlewell authored Aug 24, 2017
2 parents a5babd2 + 30fe8cb commit bfaf6ca
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
crypto11.test
demo/*.pem
demo/demo
/.idea/
/vendor/
15 changes: 15 additions & 0 deletions Gopkg.lock

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

26 changes: 26 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"


[[constraint]]
branch = "master"
name = "github.com/miekg/pkcs11"
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,15 @@ Installation

(If you don't have one already) create [a standard Go workspace](https://golang.org/doc/code.html#Workspaces) and set the `GOPATH` environment variable to point to the workspace root.

Clone and build the PKCS#11 API wrapper:
crypto11 manages it's dependencies via `dep`. To Install `dep` run:

cd $GOPATH/src
git clone https://github.com/miekg/pkcs11 github.com/miekg/pkcs11
go install github.com/miekg/pkcs11
go get -u github.com/golang/dep/cmd/dep

Clone and build Crypto11:
Clone, ensure deps, and build:

git clone [email protected]:ThalesIgnite/crypto11.git github.com/ThalesIgnite/crypto11
cd github.com/ThalesIgnite/crypto11
go get github.com/thalesignite/crypto11
cd $GOPATH/src/github.com/thalesignite/crypto11
dep ensure
go build

Edit `config` to taste, and then run the test program:
Expand Down Expand Up @@ -123,7 +122,7 @@ Testing with SoftHSM2
To set up a slot:

$ cat softhsm2.conf
directories.tokendir = /home/rjk/go/src/github.com/ThalesIgnite/crypto11/tokens
directories.tokendir = /home/rjk/go/src/github.com/thalesignite/crypto11/tokens
objectstore.backend = file
log.level = INFO
$ mkdir tokens
Expand Down

0 comments on commit bfaf6ca

Please sign in to comment.