Skip to content

Commit

Permalink
Merge branch 'RM-3647-update-repo-structure' into 'master'
Browse files Browse the repository at this point in the history
RM-3647: updated repo structure and fixed pipelines

See merge request cdoc2/cdoc2-java-ref-impl!41
  • Loading branch information
jann0k committed Aug 16, 2024
2 parents c8b7702 + 228237a commit a8cc694
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion VERSIONING.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ After creating new version Maven module or artifact, install it locally

* `mvn -f <module> versions:use-latest-versions -Dincludes=ee.cyber.cdoc2:* -DexcludeReactor=false -DallowSnapshots=true`

Example: `mvn -f cdoc2-server/get-server versions:use-latest-versions -Dincludes=ee.cyber.cdoc2:* -DexcludeReactor=false -DallowSnapshots=true`
Example: `mvn -f get-server versions:use-latest-versions -Dincludes=ee.cyber.cdoc2:* -DexcludeReactor=false -DallowSnapshots=true`


### Update cdoc2 dependencies for all modules in repository
Expand Down
6 changes: 3 additions & 3 deletions cdoc2-cli/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Building & Running

To run without building, download latest version of cdoc2-cli.jar from https://github.com/jann0k?tab=packages TODO: update repo
To run without building, download latest version of cdoc2-cli.jar from https://github.com/orgs/open-eid/packages

## Building
Run from cdoc2-java-ref-impl parent directory
Expand Down Expand Up @@ -37,7 +37,7 @@ java -jar target/cdoc2-cli-*.jar create --file /tmp/mydoc.cdoc -p keys/bob_pub.p
```

### Encryption with server scenario
Server must be running, see cdoc2-server/README.md for starting the server
Server must be running, see cdoc2-capsule-server/README.md for starting the server

To store keys in key server, specify addition `--server` option:

Expand Down Expand Up @@ -130,7 +130,7 @@ java -jar target/cdoc2-cli-*.jar decrypt --file /tmp/mydoc.cdoc -k keys/bob.pem
```

### Decrypting with server scenario
Server must be running, see cdoc2-server/README.md for starting the server
Server must be running, see cdoc2-capsule-server/README.md for starting the server

To decrypt CDOC document that has its keys distributed through key server, cdoc-cli must have `--server` option:

Expand Down
2 changes: 1 addition & 1 deletion cdoc2-cli/config/localhost/localhost_pkcs12.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# key server listening on localhost, mutual TLS with private key/certificate (P12) read from file
# See cdoc2-server/README.md how to start the server
# See cdoc2-capsule-server/README.md how to start the server

# server.id is written to cdoc header. Must have configuration on recipient side
cdoc2.client.server.id=localhost
Expand Down
4 changes: 2 additions & 2 deletions cdoc2-cli/config/localhost/localhost_pkcs12_rsa.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# localhost client configuration for RSA keys
# java -jar target/cdoc2-cli-0.0.12-SNAPSHOT.jar create --server=config/localhost/localhost_pkcs12_rsa.properties -f /tmp/localhost_rsa.cdoc -c ../cdoc2-server/keys/rsa/client-rsa-2048-cert.pem README.md
# java -jar target/cdoc2-cli-0.0.12-SNAPSHOT.jar decrypt --server=config/localhost/localhost_pkcs12_rsa.properties -f /tmp/localhost_rsa.cdoc -p12 ../cdoc2-server/keys/rsa/client-rsa-2048.p12:passwd -o /tmp/
# java -jar target/cdoc2-cli-0.0.12-SNAPSHOT.jar create --server=config/localhost/localhost_pkcs12_rsa.properties -f /tmp/localhost_rsa.cdoc -c ../cdoc2-capsule-server/keys/rsa/client-rsa-2048-cert.pem README.md
# java -jar target/cdoc2-cli-0.0.12-SNAPSHOT.jar decrypt --server=config/localhost/localhost_pkcs12_rsa.properties -f /tmp/localhost_rsa.cdoc -p12 ../cdoc2-capsule-server/keys/rsa/client-rsa-2048.p12:passwd -o /tmp/

# server.id is written to cdoc header. Must have configuration on recipient side
cdoc2.client.server.id=localhost
Expand Down
2 changes: 1 addition & 1 deletion cdoc2-cli/config/ria-dev/ria-dev_pkcs12.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ria-dev, mutual TLS establishment with private key from PKCS12 store (for reading key-capsule from the server)
# public key part of servers trusted certs. See cdoc2-server/cdoc2-server/keys/README.md
# public key part of servers trusted certs. See cdoc2-capsule-server/keys/README.md
cdoc2.client.server.id=ria-dev
cdoc2.client.server.base-url.post=https://cdoc2-keyserver.dev.riaint.ee:8443
cdoc2.client.server.base-url.get=https://cdoc2-keyserver.dev.riaint.ee:8444
Expand Down
2 changes: 1 addition & 1 deletion cdoc2-cli/config/ria-test/ria-test_p12.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ria-dev, mutual TLS establishment with private key from PKCS12 store (for reading key-capsule from the server)
# public key part of servers trusted certs. See cdoc2-server/cdoc2-server/keys/README.md
# public key part of servers trusted certs. See cdoc2-capsule-server/keys/README.md
cdoc2.client.server.id=ria-test
cdoc2.client.server.base-url.post=https://cdoc2-keyserver.test.riaint.ee:8443
cdoc2.client.server.base-url.get=https://cdoc2-keyserver.test.riaint.ee:8444
Expand Down

0 comments on commit a8cc694

Please sign in to comment.