From 6d52835efab2efd71738bfb16d7c51893bc418a8 Mon Sep 17 00:00:00 2001 From: Heiko Schaefer Date: Sat, 11 Jun 2022 21:46:32 +0200 Subject: [PATCH] Adjust paths for move to gitlab group 'openpgp-card'. --- .gitlab-ci.yml | 8 ++++---- .reuse/dep5 | 2 +- README.md | 12 ++++++------ card-functionality/README.md | 2 +- guide/book.toml | 2 +- guide/src/context.md | 2 +- guide/src/opgpcard.md | 4 ++-- guide/src/ssh.md | 2 +- openpgp-card-examples/Cargo.toml | 2 +- openpgp-card-sequoia/Cargo.toml | 2 +- openpgp-card/Cargo.toml | 2 +- openpgp-card/src/lib.rs | 2 +- pcsc/Cargo.toml | 2 +- scdc/Cargo.toml | 2 +- tools/Cargo.toml | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68aec10..7fe6f0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -129,7 +129,7 @@ cargo-test-debian-bookworm: run_cardtest_smartpgp: stage: virtual-test - image: registry.gitlab.com/hkos/openpgp-card-images/smartpgp-builddeps + image: registry.gitlab.com/openpgp-card/virtual-cards/smartpgp-builddeps script: - /etc/init.d/pcscd start - su - -c "sh /home/jcardsim/run-card.sh > /dev/null" jcardsim @@ -148,7 +148,7 @@ run_cardtest_smartpgp: run_cardtest_ykneo: stage: virtual-test - image: registry.gitlab.com/hkos/openpgp-card-images/ykneo-builddeps + image: registry.gitlab.com/openpgp-card/virtual-cards/ykneo-builddeps script: - /etc/init.d/pcscd start - su - -c "sh /home/jcardsim/run-card.sh > /dev/null" jcardsim @@ -167,7 +167,7 @@ run_cardtest_ykneo: run_cardtest_fluffypgp: stage: virtual-test - image: registry.gitlab.com/hkos/openpgp-card-images/fluffypgp-builddeps + image: registry.gitlab.com/openpgp-card/virtual-cards/fluffypgp-builddeps script: - /etc/init.d/pcscd start - su - -c "sh /home/jcardsim/run-card.sh > /dev/null" jcardsim @@ -209,7 +209,7 @@ hardware-builddeps: cache: [ ] .hw-test-template: - image: registry.gitlab.com/hkos/openpgp-card/hardware-builddeps + image: registry.gitlab.com/openpgp-card/openpgp-card/hardware-builddeps tags: - card parallel: diff --git a/.reuse/dep5 b/.reuse/dep5 index 1ff5940..fda4287 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: OpenPGP card Upstream-Contact: Heiko Schaefer -Source: https://gitlab.com/hkos/openpgp-card +Source: https://gitlab.com/openpgp-card/openpgp-card Files: openpgp-card-sequoia/example/* Copyright: 2021 Heiko Schaefer diff --git a/README.md b/README.md index a5d9d9c..6cc2c99 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,9 @@ top of the libraries described above: - [openpgp-card-tools](https://crates.io/crates/openpgp-card-sequoia), a CLI tool to inspect, manage and use OpenPGP cards, aimed at end users. -- [openpgp-card-tests](https://gitlab.com/hkos/openpgp-card/-/tree/main/card-functionality), +- [openpgp-card-tests](https://gitlab.com/openpgp-card/openpgp-card/-/tree/main/card-functionality), a test-suite that runs OpenPGP card operations on smartcards. -- [openpgp-card-examples](https://gitlab.com/hkos/openpgp-card/-/tree/main/card-examples), +- [openpgp-card-examples](https://gitlab.com/openpgp-card/openpgp-card/-/tree/main/card-examples), small example applications that demonstrate how you can use these libraries in your own projects to access OpenPGP card functionality. @@ -112,14 +112,14 @@ It's possible to run simulated JavaCard applets on a host computer, and make those available via the [PCSC lite](https://pcsclite.apdu.fr/) framework. To simplify testing against such simulated cards, the -https://gitlab.com/hkos/openpgp-card-images repository provides Container +https://gitlab.com/openpgp-card/virtual-cards repository provides Container images for the "SmartPGP" and "YubiKey NEO" OpenPGP card implementations. These images are used to run card-functionality tests on gitlab's CI. See the GitLab CI config -[hkos/openpgp-card:.gitlab-ci.yml](https://gitlab.com/hkos/openpgp-card/-/blob/main/.gitlab-ci.yml) +[openpgp-card/openpgp-card:.gitlab-ci.yml](https://gitlab.com/openpgp-card/openpgp-card/-/blob/main/.gitlab-ci.yml) and the Dockerfiles and run script: -[hkos/openpgp-card:card-functionality/docker/](https://gitlab.com/hkos/openpgp-card/-/tree/main/card-functionality/docker/). +[openpgp-card/openpgp-card:card-functionality/docker/](https://gitlab.com/openpgp-card/openpgp-card/-/tree/main/card-functionality/docker/). ### Emulated Gnuk @@ -136,7 +136,7 @@ This means that to use an emulated Gnuk, you need to have both root privileges and be able to load a kernel module (so running an emulated Gnuk is not currently possible in GitLab CI). -See the [README](https://gitlab.com/hkos/openpgp-card/-/tree/main/card-functionality#running-tests-against-emulated-gnuk-via-pcsc) +See the [README](https://gitlab.com/openpgp-card/openpgp-card/-/tree/main/card-functionality#running-tests-against-emulated-gnuk-via-pcsc) of the `card-functionality` project for more information on this. diff --git a/card-functionality/README.md b/card-functionality/README.md index b829ca3..9f89c18 100644 --- a/card-functionality/README.md +++ b/card-functionality/README.md @@ -65,7 +65,7 @@ systemctl start pcscd ``` (Alternatively, you could use the experimental -[scdaemon backend](https://gitlab.com/hkos/openpgp-card/-/tree/scdc)) +[scdaemon backend](https://gitlab.com/openpgp-card/openpgp-card/-/tree/scdc)) # Running tests (against emulated Gnuk via PC/SC) diff --git a/guide/book.toml b/guide/book.toml index 64d4653..1bb6d26 100644 --- a/guide/book.toml +++ b/guide/book.toml @@ -9,7 +9,7 @@ src = "src" title = "OpenPGP card user guide" [output.html] -git-repository-url = "https://gitlab.com/hkos/openpgp-card" +git-repository-url = "https://gitlab.com/openpgp-card/openpgp-card" git-repository-icon = "fa-gitlab" [build] diff --git a/guide/src/context.md b/guide/src/context.md index be13daa..dac7dda 100644 --- a/guide/src/context.md +++ b/guide/src/context.md @@ -29,7 +29,7 @@ Until now, most users have interacted with OpenPGP cards using one or both of: ## New OpenPGP card tools This series of guides introduces a new set of tools that leverage OpenPGP cards, written in Rust. -These tools are built on a set of [OpenPGP card libraries](https://gitlab.com/hkos/openpgp-card) +These tools are built on a set of [OpenPGP card libraries](https://gitlab.com/openpgp-card/openpgp-card) and [Sequoia PGP](https://sequoia-pgp.org/). The ultimate goal of this series is to document a complete suite of easy-to-use tools for all use cases around diff --git a/guide/src/opgpcard.md b/guide/src/opgpcard.md index de4530e..afdc363 100644 --- a/guide/src/opgpcard.md +++ b/guide/src/opgpcard.md @@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT OR Apache-2.0 To set up and inspect OpenPGP cards, we'll use the [`opgpcard`](https://crates.io/crates/openpgp-card-tools) tool, which is based on [Sequoia PGP](https://sequoia-pgp.org/) -and [new Rust OpenPGP card libraries](https://gitlab.com/hkos/openpgp-card). +and [new Rust OpenPGP card libraries](https://gitlab.com/openpgp-card/openpgp-card). ## Install @@ -16,7 +16,7 @@ To install the `opgpcard` tool, we - install the required build dependencies (a Rust toolchain, pcsc-lite, nettle), then - `cargo install openpgp-card-tools` -[Detailed installation instructions](https://gitlab.com/hkos/openpgp-card/-/tree/main/tools#install). +[Detailed installation instructions](https://gitlab.com/openpgp-card/openpgp-card/-/tree/main/tools#install). ## Running opgpcard diff --git a/guide/src/ssh.md b/guide/src/ssh.md index de5b93b..1d0275c 100644 --- a/guide/src/ssh.md +++ b/guide/src/ssh.md @@ -10,7 +10,7 @@ In this guide, we'll set up OpenPGP card-based SSH logins to a remote machine. We assume that you have an OpenPGP card plugged into your client machine, and that an authentication key is available on that card. -We also assume that the `opgpcard` tool [is installed](https://hkos.gitlab.io/openpgp-card/opgpcard.html#install). +We also assume that the `opgpcard` tool [is installed](https://openpgp-card.gitlab.io/openpgp-card/opgpcard.html#install). ## Optional: generate throwaway keys on your card, for this guide diff --git a/openpgp-card-examples/Cargo.toml b/openpgp-card-examples/Cargo.toml index 01b8a9b..8e9083d 100644 --- a/openpgp-card-examples/Cargo.toml +++ b/openpgp-card-examples/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" version = "0.0.1" authors = ["Wiktor Kwapisiewicz "] edition = "2018" -repository = "https://gitlab.com/hkos/openpgp-card" +repository = "https://gitlab.com/openpgp-card/openpgp-card" documentation = "https://docs.rs/crate/openpgp-card-examples" [dependencies] diff --git a/openpgp-card-sequoia/Cargo.toml b/openpgp-card-sequoia/Cargo.toml index 8205453..0ca1e2c 100644 --- a/openpgp-card-sequoia/Cargo.toml +++ b/openpgp-card-sequoia/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" version = "0.0.13" authors = ["Heiko Schaefer "] edition = "2018" -repository = "https://gitlab.com/hkos/openpgp-card" +repository = "https://gitlab.com/openpgp-card/openpgp-card" documentation = "https://docs.rs/crate/openpgp-card-sequoia" [dependencies] diff --git a/openpgp-card/Cargo.toml b/openpgp-card/Cargo.toml index 42ae930..7450b6f 100644 --- a/openpgp-card/Cargo.toml +++ b/openpgp-card/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" version = "0.2.6" authors = ["Heiko Schaefer "] edition = "2018" -repository = "https://gitlab.com/hkos/openpgp-card" +repository = "https://gitlab.com/openpgp-card/openpgp-card" documentation = "https://docs.rs/crate/openpgp-card" [dependencies] diff --git a/openpgp-card/src/lib.rs b/openpgp-card/src/lib.rs index 9d3fb29..09c46ca 100644 --- a/openpgp-card/src/lib.rs +++ b/openpgp-card/src/lib.rs @@ -23,7 +23,7 @@ //! crate offers a higher level wrapper based on the [Sequoia PGP](https://sequoia-pgp.org/) //! implementation. //! -//! See the [architecture diagram](https://gitlab.com/hkos/openpgp-card#architecture) for +//! See the [architecture diagram](https://gitlab.com/openpgp-card/openpgp-card#architecture) for //! a visualization. extern crate core; diff --git a/pcsc/Cargo.toml b/pcsc/Cargo.toml index fd27c16..44c17b1 100644 --- a/pcsc/Cargo.toml +++ b/pcsc/Cargo.toml @@ -8,7 +8,7 @@ authors = ["Heiko Schaefer "] license = "MIT OR Apache-2.0" version = "0.2.1" edition = "2018" -repository = "https://gitlab.com/hkos/openpgp-card" +repository = "https://gitlab.com/openpgp-card/openpgp-card" documentation = "https://docs.rs/crate/openpgp-card-pcsc" [dependencies] diff --git a/scdc/Cargo.toml b/scdc/Cargo.toml index b0f7cba..56c657a 100644 --- a/scdc/Cargo.toml +++ b/scdc/Cargo.toml @@ -8,7 +8,7 @@ authors = ["Heiko Schaefer "] license = "MIT OR Apache-2.0" version = "0.2.1" edition = "2018" -repository = "https://gitlab.com/hkos/openpgp-card" +repository = "https://gitlab.com/openpgp-card/openpgp-card" documentation = "https://docs.rs/crate/openpgp-card-scdc" [dependencies] diff --git a/tools/Cargo.toml b/tools/Cargo.toml index 3db5529..ee726ab 100644 --- a/tools/Cargo.toml +++ b/tools/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" version = "0.0.11" authors = ["Heiko Schaefer "] edition = "2018" -repository = "https://gitlab.com/hkos/openpgp-card" +repository = "https://gitlab.com/openpgp-card/openpgp-card" documentation = "https://docs.rs/crate/openpgp-card-tools" [dependencies]