Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

totp fix

Browse Source
This commit is contained in:
RogueMaster
2022-10-12 01:04:14 -04:00
parent e735b8a38e
commit a9d3abe727
9 changed files with 1 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/plugins/totp/services/config/config.c
View File

@@ -207,7 +207,7 @@ void totp_config_file_load_base(PluginState* const plugin_state) {
if(file_version < CONFIG_FILE_ACTUAL_VERSION) {
FURI_LOG_I(
LOGGING_TAG,
"Obsolete config file version detected. Current version: %d; Actual version: %d",
"Obsolete config file version detected. Current version: %ld; Actual version: %d",
file_version,
CONFIG_FILE_ACTUAL_VERSION);
totp_close_config_file(fff_data_file);

71
applications/plugins/totp/services/hmac/hmac-common.h
View File

@@ -1,71 +0,0 @@
#include <string.h>
#include "sha256.h"
#include "memxor.h"
#define IPAD 0x36
#define OPAD 0x5c
/* Concatenate two preprocessor tokens. */
#define _GLHMAC_CONCAT_(prefix, suffix) prefix##suffix
#define _GLHMAC_CONCAT(prefix, suffix) _GLHMAC_CONCAT_ (prefix, suffix)
#if GL_HMAC_NAME == 5
# define HMAC_ALG md5
#else
# define HMAC_ALG _GLHMAC_CONCAT (sha, GL_HMAC_NAME)
#endif
#define GL_HMAC_CTX _GLHMAC_CONCAT (HMAC_ALG, _ctx)
#define GL_HMAC_FN _GLHMAC_CONCAT (hmac_, HMAC_ALG)
#define GL_HMAC_FN_INIT _GLHMAC_CONCAT (HMAC_ALG, _init_ctx)
#define GL_HMAC_FN_BLOC _GLHMAC_CONCAT (HMAC_ALG, _process_block)
#define GL_HMAC_FN_PROC _GLHMAC_CONCAT (HMAC_ALG, _process_bytes)
#define GL_HMAC_FN_FINI _GLHMAC_CONCAT (HMAC_ALG, _finish_ctx)
static void
hmac_hash (const void *key, size_t keylen,
const void *in, size_t inlen,
int pad, void *resbuf)
{
struct GL_HMAC_CTX hmac_ctx;
char block[GL_HMAC_BLOCKSIZE];
memset (block, pad, sizeof block);
memxor (block, key, keylen);
GL_HMAC_FN_INIT (&hmac_ctx);
GL_HMAC_FN_BLOC (block, sizeof block, &hmac_ctx);
GL_HMAC_FN_PROC (in, inlen, &hmac_ctx);
GL_HMAC_FN_FINI (&hmac_ctx, resbuf);
}
int
GL_HMAC_FN (const void *key, size_t keylen,
const void *in, size_t inlen, void *resbuf)
{
char optkeybuf[GL_HMAC_HASHSIZE];
char innerhash[GL_HMAC_HASHSIZE];
/* Ensure key size is <= block size. */
if (keylen > GL_HMAC_BLOCKSIZE)
{
struct GL_HMAC_CTX keyhash;
GL_HMAC_FN_INIT (&keyhash);
GL_HMAC_FN_PROC (key, keylen, &keyhash);
GL_HMAC_FN_FINI (&keyhash, optkeybuf);
key = optkeybuf;
/* zero padding of the key to the block size
is implicit in the memxor. */
keylen = sizeof optkeybuf;
}
/* Compute INNERHASH from KEY and IN. */
hmac_hash (key, keylen, in, inlen, IPAD, innerhash);
/* Compute result from KEY and INNERHASH. */
hmac_hash (key, keylen, innerhash, sizeof innerhash, OPAD, resbuf);
return 0;
}

24
applications/plugins/totp/services/hmac/hmac-sha1.c
View File

@@ -1,24 +0,0 @@
/* hmac-sha1.c -- hashed message authentication codes
Copyright (C) 2018-2022 Free Software Foundation, Inc.
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
This file is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. */
#include "hmac-sha1.h"
#include "sha1.h"
#define GL_HMAC_NAME 1
#define GL_HMAC_BLOCKSIZE 64
#define GL_HMAC_HASHSIZE 20
#include "hmac-common.h"

11
applications/plugins/totp/services/hmac/hmac-sha1.h
View File

@@ -1,11 +0,0 @@
#pragma once
#include <stddef.h>
#define HMAC_SHA1_RESULT_SIZE 20
/* Compute Hashed Message Authentication Code with SHA-1, over BUFFER
data of BUFLEN bytes using the KEY of KEYLEN bytes, writing the
output to pre-allocated 20 byte minimum RESBUF buffer. Return 0 on
success. */
int hmac_sha1 (const void *key, size_t keylen, const void *in, size_t inlen, void *restrict resbuf);

23
applications/plugins/totp/services/hmac/hmac-sha256.c
View File

@@ -1,23 +0,0 @@
/* hmac-sha256.c -- hashed message authentication codes
Copyright (C) 2018-2022 Free Software Foundation, Inc.
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
This file is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. */
#include "hmac-sha256.h"
#define GL_HMAC_NAME 256
#define GL_HMAC_BLOCKSIZE 64
#define GL_HMAC_HASHSIZE 32
#include "hmac-common.h"

11
applications/plugins/totp/services/hmac/hmac-sha256.h
View File

@@ -1,11 +0,0 @@
#pragma once
#include <stddef.h>
#define HMAC_SHA256_RESULT_SIZE 32
/* Compute Hashed Message Authentication Code with SHA-256, over BUFFER
data of BUFLEN bytes using the KEY of KEYLEN bytes, writing the
output to pre-allocated 32 byte minimum RESBUF buffer. Return 0 on
success. */
int hmac_sha256 (const void *key, size_t keylen, const void *in, size_t inlen, void *restrict resbuf);

24
applications/plugins/totp/services/hmac/hmac-sha512.c
View File

@@ -1,24 +0,0 @@
/* hmac-sha512.c -- hashed message authentication codes
Copyright (C) 2018-2022 Free Software Foundation, Inc.
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
This file is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. */
#include "hmac-sha512.h"
#include "sha512.h"
#define GL_HMAC_NAME 512
#define GL_HMAC_BLOCKSIZE 128
#define GL_HMAC_HASHSIZE 64
#include "hmac-common.h"

11
applications/plugins/totp/services/hmac/hmac-sha512.h
View File

@@ -1,11 +0,0 @@
#pragma once
#include <stddef.h>
#define HMAC_SHA512_RESULT_SIZE 64
/* Compute Hashed Message Authentication Code with SHA-512, over BUFFER
data of BUFLEN bytes using the KEY of KEYLEN bytes, writing the
output to pre-allocated 64 byte minimum RESBUF buffer. Return 0 on
success. */
int hmac_sha512 (const void *key, size_t keylen, const void *in, size_t inlen, void *restrict resbuf);

32
applications/plugins/totp/totp_app_cli.c
View File

@@ -1,32 +0,0 @@
#include <furi.h>
#include <cli/cli.h>
#include <storage/storage.h>
void totp_cli_print_usage() {
printf("Usage:\r\n");
printf("totp <cmd> <args>\r\n");
printf("Cmd list:\r\n");
printf("\tadd <secret:string> <name:string>\t - Add new TOTP secret\r\n");
printf("\tremove <name:string>\t - Remove TOTP token\r\n");
printf("\reset\t - Reset app to default (reset PIN and removes all tokens)\r\n");
};
static void totp_cli(Cli* cli, FuriString* args, void* context) {
UNUSED(cli);
UNUSED(args);
UNUSED(context);
totp_cli_print_usage();
// TODO: implement add\remove\reset
}
void totp_on_system_start() {
#ifdef SRV_CLI
Cli* cli = furi_record_open(RECORD_CLI);
cli_add_command(cli, "totp", CliCommandFlagDefault, totp_cli, NULL);
furi_record_close(RECORD_CLI);
#else
UNUSED(totp_cli);
#endif
}