Skip to content

Commit

Permalink
rename organization
Browse files Browse the repository at this point in the history
  • Loading branch information
abarisani committed Mar 16, 2022
1 parent b74ad0f commit 0dc596d
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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-
Expand All @@ -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 \
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
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
```

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
```

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,
Expand All @@ -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
=========
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions main.go
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions mem.go
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions scsi.go
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 (
Expand Down
8 changes: 4 additions & 4 deletions usb.go
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down

0 comments on commit 0dc596d

Please sign in to comment.