Skip to content

Commit a8cc694

Browse files
committed
Merge branch 'RM-3647-update-repo-structure' into 'master'
RM-3647: updated repo structure and fixed pipelines See merge request cdoc2/cdoc2-java-ref-impl!41
2 parents c8b7702 + 228237a commit a8cc694

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

VERSIONING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ After creating new version Maven module or artifact, install it locally
3737

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

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

4242

4343
### Update cdoc2 dependencies for all modules in repository

cdoc2-cli/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Building & Running
22

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

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

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

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

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

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

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

cdoc2-cli/config/localhost/localhost_pkcs12.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# key server listening on localhost, mutual TLS with private key/certificate (P12) read from file
2-
# See cdoc2-server/README.md how to start the server
2+
# See cdoc2-capsule-server/README.md how to start the server
33

44
# server.id is written to cdoc header. Must have configuration on recipient side
55
cdoc2.client.server.id=localhost

cdoc2-cli/config/localhost/localhost_pkcs12_rsa.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# localhost client configuration for RSA keys
2-
# 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
3-
# 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/
2+
# 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
3+
# 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/
44

55
# server.id is written to cdoc header. Must have configuration on recipient side
66
cdoc2.client.server.id=localhost

cdoc2-cli/config/ria-dev/ria-dev_pkcs12.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ria-dev, mutual TLS establishment with private key from PKCS12 store (for reading key-capsule from the server)
2-
# public key part of servers trusted certs. See cdoc2-server/cdoc2-server/keys/README.md
2+
# public key part of servers trusted certs. See cdoc2-capsule-server/keys/README.md
33
cdoc2.client.server.id=ria-dev
44
cdoc2.client.server.base-url.post=https://cdoc2-keyserver.dev.riaint.ee:8443
55
cdoc2.client.server.base-url.get=https://cdoc2-keyserver.dev.riaint.ee:8444

cdoc2-cli/config/ria-test/ria-test_p12.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ria-dev, mutual TLS establishment with private key from PKCS12 store (for reading key-capsule from the server)
2-
# public key part of servers trusted certs. See cdoc2-server/cdoc2-server/keys/README.md
2+
# public key part of servers trusted certs. See cdoc2-capsule-server/keys/README.md
33
cdoc2.client.server.id=ria-test
44
cdoc2.client.server.base-url.post=https://cdoc2-keyserver.test.riaint.ee:8443
55
cdoc2.client.server.base-url.get=https://cdoc2-keyserver.test.riaint.ee:8444

0 commit comments

Comments
 (0)