From 2e8f6405e71b8eb86ad29b30b4739d8dd66e2aae Mon Sep 17 00:00:00 2001 From: d0k3 Date: Thu, 8 Dec 2016 13:18:25 +0100 Subject: [PATCH] Miscellaneous cosmetics --- source/crypto/aes.h | 3 +++ source/fs.c | 4 ++-- source/godmode.c | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source/crypto/aes.h b/source/crypto/aes.h index 23e27a1..9c9e12f 100644 --- a/source/crypto/aes.h +++ b/source/crypto/aes.h @@ -52,9 +52,12 @@ void setup_aeskey(uint8_t keyslot, const void* keyy); void use_aeskey(uint32_t keyno); void set_ctr(void* iv); void add_ctr(void* ctr, uint32_t carry); +void subtract_ctr(void* ctr, uint32_t carry); void aes_decrypt(void* inbuf, void* outbuf, size_t size, uint32_t mode); void ctr_decrypt(void* inbuf, void* outbuf, size_t size, uint32_t mode, uint8_t *ctr); void ctr_decrypt_byte(void *inbuf, void *outbuf, size_t size, size_t off, uint32_t mode, uint8_t *ctr); +void ecb_decrypt(void *inbuf, void *outbuf, size_t size, uint32_t mode); +void cbc_decrypt(void *inbuf, void *outbuf, size_t size, uint32_t mode, uint8_t *ctr); void aes_cmac(void* inbuf, void* outbuf, size_t size); void aes_fifos(void* inbuf, void* outbuf, size_t blocks); void set_aeswrfifo(uint32_t value); diff --git a/source/fs.c b/source/fs.c index 25bdada..e446515 100644 --- a/source/fs.c +++ b/source/fs.c @@ -228,7 +228,7 @@ bool FormatSDCard(u64 hidden_mb, u32 cluster_size) { // FAT size check if (fat_size < 0x80000) { // minimum free space: 256MB - ShowPrompt(false, "ERROR: SD card is too small"); + ShowPrompt(false, "Error: SD card is too small"); return false; } sd_size = fat_size; @@ -250,7 +250,7 @@ bool FormatSDCard(u64 hidden_mb, u32 cluster_size) { // write the MBR to disk // !this assumes a fully deinitialized file system! if ((sdmmc_sdcard_init() != 0) || (sdmmc_sdcard_writesectors(0, 1, mbr) != 0)) { - ShowPrompt(false, "ERROR: SD card i/o failure"); + ShowPrompt(false, "Error: SD card i/o failure"); return false; } diff --git a/source/godmode.c b/source/godmode.c index 8cd55a7..4fa3058 100644 --- a/source/godmode.c +++ b/source/godmode.c @@ -5,7 +5,6 @@ #include "platform.h" #include "nand.h" #include "virtual.h" -#include "vgame.h" #include "image.h" #define N_PANES 2 @@ -202,7 +201,7 @@ u32 SdFormatMenu(void) { // check actual SD card size sdcard_size_mb = GetSDCardSize() / 0x100000; if (!sdcard_size_mb) { - ShowPrompt(false, "ERROR: SD card not detected."); + ShowPrompt(false, "Error: SD card not detected."); return 1; }