From 0dc596dab9b774691482495bf304a11a549d3f09 Mon Sep 17 00:00:00 2001 From: Andrea Barisani Date: Wed, 16 Mar 2022 10:54:10 +0100 Subject: [PATCH] rename organization --- LICENSE | 2 +- Makefile | 10 +++++----- README.md | 22 +++++++++++----------- main.go | 10 +++++----- mem.go | 4 ++-- scsi.go | 8 ++++---- usb.go | 8 ++++---- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/LICENSE b/LICENSE index 1fadbbc..9ab2ebb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -https://github.com/f-secure-foundry/armory-ums +https://github.com/usbarmory/armory-ums Copyright (c) F-Secure Corporation This program is free software: you can redistribute it and/or modify it under diff --git a/Makefile b/Makefile index d48f6b7..071c266 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# http://github.com/f-secure-foundry/armory-ums +# http://github.com/usbarmory/armory-ums # # Copyright (c) F-Secure Corporation # https://foundry.f-secure.com @@ -35,14 +35,14 @@ elf: $(APP) check_tamago: @if [ "${TAMAGO}" == "" ] || [ ! -f "${TAMAGO}" ]; then \ - echo 'You need to set the TAMAGO variable to a compiled version of https://github.com/f-secure-foundry/tamago-go'; \ + echo 'You need to set the TAMAGO variable to a compiled version of https://github.com/usbarmory/tamago-go'; \ exit 1; \ fi check_hab_keys: @if [ "${HAB_KEYS}" == "" ]; then \ echo 'You need to set the HAB_KEYS variable to the path of secure boot keys'; \ - echo 'See https://github.com/f-secure-foundry/usbarmory/wiki/Secure-boot-(Mk-II)'; \ + echo 'See https://github.com/usbarmory/usbarmory/wiki/Secure-boot-(Mk-II)'; \ exit 1; \ fi @@ -62,7 +62,7 @@ $(APP): check_tamago $(APP).dcd: check_tamago $(APP).dcd: GOMODCACHE=$(shell ${TAMAGO} env GOMODCACHE) -$(APP).dcd: TAMAGO_PKG=$(shell grep "github.com/f-secure-foundry/tamago v" go.mod | awk '{print $$1"@"$$2}') +$(APP).dcd: TAMAGO_PKG=$(shell grep "github.com/usbarmory/tamago v" go.mod | awk '{print $$1"@"$$2}') $(APP).dcd: dcd $(APP).bin: CROSS_COMPILE=arm-none-eabi- @@ -81,7 +81,7 @@ $(APP).imx: $(APP).bin $(APP).dcd #### secure boot #### $(APP)-signed.imx: check_hab_keys $(APP).imx - ${TAMAGO} install github.com/f-secure-foundry/crucible/cmd/habtool + ${TAMAGO} install github.com/usbarmory/crucible/cmd/habtool $(shell ${TAMAGO} env GOPATH)/bin/habtool \ -A ${HAB_KEYS}/CSF_1_key.pem \ -a ${HAB_KEYS}/CSF_1_crt.pem \ diff --git a/README.md b/README.md index fd2bf28..22ccae1 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,24 @@ Introduction ============ -This [TamaGo](https://github.com/f-secure-foundry/tamago) based unikernel -allows USB Mass Storage interfacing for the [USB armory Mk II](https://github.com/f-secure-foundry/usbarmory/wiki) +This [TamaGo](https://github.com/usbarmory/tamago) based unikernel +allows USB Mass Storage interfacing for the [USB armory Mk II](https://github.com/usbarmory/usbarmory/wiki) internal eMMC card as well as any inserted external microSD card. Binary releases =============== Pre-compiled binary releases are available -[here](https://github.com/f-secure-foundry/armory-ums/releases). +[here](https://github.com/usbarmory/armory-ums/releases). Compiling ========= -Build the [TamaGo compiler](https://github.com/f-secure-foundry/tamago-go) -(or use the [latest binary release](https://github.com/f-secure-foundry/tamago-go/releases/latest)): +Build the [TamaGo compiler](https://github.com/usbarmory/tamago-go) +(or use the [latest binary release](https://github.com/usbarmory/tamago-go/releases/latest)): ``` -wget https://github.com/f-secure-foundry/tamago-go/archive/refs/tags/latest.zip +wget https://github.com/usbarmory/tamago-go/archive/refs/tags/latest.zip unzip latest.zip cd tamago-go-latest/src && ./all.bash cd ../bin && export TAMAGO=`pwd`/go @@ -26,11 +26,11 @@ cd ../bin && export TAMAGO=`pwd`/go Build the `armory-ums.imx` application executable (note that on secure booted units the `imx_signed` target should be used with the relevant -[`HAB_KEYS`](https://github.com/f-secure-foundry/usbarmory/wiki/Secure-boot-(Mk-II)) set. +[`HAB_KEYS`](https://github.com/usbarmory/usbarmory/wiki/Secure-boot-(Mk-II)) set. ``` -git clone https://github.com/f-secure-foundry/armory-ums && cd armory-ums +git clone https://github.com/usbarmory/armory-ums && cd armory-ums make CROSS_COMPILE=arm-none-eabi- imx ``` @@ -38,7 +38,7 @@ Executing ========= The resulting `armory-ums.imx` file can be executed over USB using -[SDP](https://github.com/f-secure-foundry/usbarmory/wiki/Boot-Modes-(Mk-II)#serial-download-protocol-sdp). +[SDP](https://github.com/usbarmory/usbarmory/wiki/Boot-Modes-(Mk-II)#serial-download-protocol-sdp). SDP mode requires boot switch configuration towards microSD without any card inserted, however armory-ums detects microSD card only at startup. Therefore, @@ -52,7 +52,7 @@ procedure: 5. Launch `imx_usb armory-ums.imx`. Alternatively, to expose the internal eMMC card, armory-ums can be -[flashed on any microSD](https://github.com/f-secure-foundry/usbarmory/wiki/Boot-Modes-(Mk-II)#flashing-imx-native-images). +[flashed on any microSD](https://github.com/usbarmory/usbarmory/wiki/Boot-Modes-(Mk-II)#flashing-imx-native-images). Operation ========= @@ -77,7 +77,7 @@ andrea.barisani@f-secure.com | andrea@inversepath.com License ======= -armory-ums | https://github.com/f-secure-foundry/armory-ums +armory-ums | https://github.com/usbarmory/armory-ums Copyright (c) F-Secure Corporation This program is free software: you can redistribute it and/or modify it under diff --git a/main.go b/main.go index 1e4bff0..145eb98 100644 --- a/main.go +++ b/main.go @@ -1,4 +1,4 @@ -// https://github.com/f-secure-foundry/armory-ums +// https://github.com/usbarmory/armory-ums // // Copyright (c) F-Secure Corporation // https://foundry.f-secure.com @@ -12,11 +12,11 @@ import ( "fmt" "log" - "github.com/f-secure-foundry/tamago/soc/imx6" - "github.com/f-secure-foundry/tamago/soc/imx6/usb" - "github.com/f-secure-foundry/tamago/soc/imx6/usdhc" + "github.com/usbarmory/tamago/soc/imx6" + "github.com/usbarmory/tamago/soc/imx6/usb" + "github.com/usbarmory/tamago/soc/imx6/usdhc" - "github.com/f-secure-foundry/tamago/board/f-secure/usbarmory/mark-two" + "github.com/usbarmory/tamago/board/f-secure/usbarmory/mark-two" ) var cards []*usdhc.USDHC diff --git a/mem.go b/mem.go index a29378d..7716e2d 100644 --- a/mem.go +++ b/mem.go @@ -1,4 +1,4 @@ -// https://github.com/f-secure-foundry/armory-ums +// https://github.com/usbarmory/armory-ums // // Copyright (c) F-Secure Corporation // https://foundry.f-secure.com @@ -11,7 +11,7 @@ package main import ( _ "unsafe" - "github.com/f-secure-foundry/tamago/dma" + "github.com/usbarmory/tamago/dma" ) // Override usbarmory pkg ramSize and `mem` allocation, as this application diff --git a/scsi.go b/scsi.go index 3e1ded5..724ca1d 100644 --- a/scsi.go +++ b/scsi.go @@ -1,4 +1,4 @@ -// https://github.com/f-secure-foundry/armory-ums +// https://github.com/usbarmory/armory-ums // // Copyright (c) F-Secure Corporation // https://foundry.f-secure.com @@ -13,9 +13,9 @@ import ( "encoding/binary" "fmt" - "github.com/f-secure-foundry/tamago/dma" - "github.com/f-secure-foundry/tamago/soc/imx6/usb" - "github.com/f-secure-foundry/tamago/soc/imx6/usdhc" + "github.com/usbarmory/tamago/dma" + "github.com/usbarmory/tamago/soc/imx6/usb" + "github.com/usbarmory/tamago/soc/imx6/usdhc" ) const ( diff --git a/usb.go b/usb.go index ab84639..e7f1ff7 100644 --- a/usb.go +++ b/usb.go @@ -1,4 +1,4 @@ -// https://github.com/f-secure-foundry/armory-ums +// https://github.com/usbarmory/armory-ums // // Copyright (c) F-Secure Corporation // https://foundry.f-secure.com @@ -16,9 +16,9 @@ import ( "fmt" "strings" - "github.com/f-secure-foundry/tamago/dma" - "github.com/f-secure-foundry/tamago/soc/imx6" - "github.com/f-secure-foundry/tamago/soc/imx6/usb" + "github.com/usbarmory/tamago/dma" + "github.com/usbarmory/tamago/soc/imx6" + "github.com/usbarmory/tamago/soc/imx6/usb" ) const maxPacketSize = 512