+ base64 en- and decoding
This commit is contained in:
bg
parent
db28d1aea2
commit
e764812766
|
|
@ -0,0 +1,245 @@
|
|||
/* base64_dec.c */
|
||||
/*
|
||||
* This file is part of the AVR-Crypto-Lib.
|
||||
* Copyright (C) 2006, 2007, 2008 Daniel Otte (daniel.otte@rub.de)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* base64 decoder (RFC3548)
|
||||
* Author: Daniel Otte
|
||||
* License: GPLv3
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include "base64_dec.h"
|
||||
|
||||
#include "test_src/cli.h"
|
||||
|
||||
#define USE_GCC_EXTENSION
|
||||
|
||||
#if 1
|
||||
|
||||
#ifdef USE_GCC_EXTENSION
|
||||
|
||||
static
|
||||
int ascii2bit6(char a){
|
||||
switch(a){
|
||||
case 'A'...'Z':
|
||||
return a-'A';
|
||||
case 'a'...'z':
|
||||
return a-'a'+26;
|
||||
case '0'...'9':
|
||||
return a-'0'+52;
|
||||
case '+':
|
||||
case '-':
|
||||
return 62;
|
||||
case '/':
|
||||
case '_':
|
||||
return 63;
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
static
|
||||
uint8_t ascii2bit6(char a){
|
||||
int r;
|
||||
switch(a>>4){
|
||||
case 0x5:
|
||||
case 0x4:
|
||||
r=a-'A';
|
||||
if(r<0 || r>25){
|
||||
return -1;
|
||||
} else {
|
||||
return r;
|
||||
}
|
||||
case 0x7:
|
||||
case 0x6:
|
||||
r=a-'a';
|
||||
if(r<0 || r>25){
|
||||
return -1;
|
||||
} else {
|
||||
return r+26;
|
||||
}
|
||||
break;
|
||||
case 0x3:
|
||||
if(a>'9')
|
||||
return -1;
|
||||
return a-'0'+52;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
switch (a){
|
||||
case '+':
|
||||
case '-':
|
||||
return 62;
|
||||
case '/':
|
||||
case '_':
|
||||
return 63;
|
||||
default:
|
||||
return 0xff;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
static
|
||||
uint8_t ascii2bit6(uint8_t a){
|
||||
if(a>='A' && a<='Z'){
|
||||
return a-'A';
|
||||
} else {
|
||||
if(a>='a' && a<= 'z'){
|
||||
return a-'a'+26;
|
||||
} else {
|
||||
if(a>='0' && a<='9'){
|
||||
return a-'0'+52;
|
||||
} else {
|
||||
if(a=='+' || a=='-'){
|
||||
return 62;
|
||||
} else {
|
||||
if(a=='/' || a=='_'){
|
||||
return 63;
|
||||
} else {
|
||||
return 0xff;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
int base64_binlength(char* str, uint8_t strict){
|
||||
int l=0;
|
||||
uint8_t term=0;
|
||||
for(;;){
|
||||
if(*str=='\0')
|
||||
break;
|
||||
if(*str=='\n' || *str=='\r'){
|
||||
str++;
|
||||
continue;
|
||||
}
|
||||
if(*str=='='){
|
||||
term++;
|
||||
str++;
|
||||
if(term==2){
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if(term)
|
||||
return -1;
|
||||
if(ascii2bit6(*str)==-1){
|
||||
if(strict)
|
||||
return -1;
|
||||
} else {
|
||||
l++;
|
||||
}
|
||||
str++;
|
||||
}
|
||||
switch(term){
|
||||
case 0:
|
||||
if(l%4!=0)
|
||||
return -1;
|
||||
return l/4*3;
|
||||
case 1:
|
||||
if(l%4!=3)
|
||||
return -1;
|
||||
return (l+1)/4*3-1;
|
||||
case 2:
|
||||
if(l%4!=2)
|
||||
return -1;
|
||||
return (l+2)/4*3-2;
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|543210543210543210543210|
|
||||
|765432107654321076543210|
|
||||
|
||||
. . . .
|
||||
|54321054|32105432|10543210|
|
||||
|76543210|76543210|76543210|
|
||||
|
||||
*/
|
||||
|
||||
int base64dec(void* dest, char* b64str, uint8_t strict){
|
||||
uint8_t buffer[4];
|
||||
uint8_t idx=0;
|
||||
uint8_t term=0;
|
||||
for(;;){
|
||||
// cli_putstr_P(PSTR("\r\n DBG: got 0x"));
|
||||
// cli_hexdump(b64str, 1);
|
||||
buffer[idx]= ascii2bit6(*b64str);
|
||||
// cli_putstr_P(PSTR(" --> 0x"));
|
||||
// cli_hexdump(buffer+idx, 1);
|
||||
|
||||
if(buffer[idx]==0xFF){
|
||||
if(*b64str=='='){
|
||||
term++;
|
||||
b64str++;
|
||||
if(term==2)
|
||||
goto finalize; /* definitly the end */
|
||||
}else{
|
||||
if(*b64str == '\0'){
|
||||
goto finalize; /* definitly the end */
|
||||
}else{
|
||||
if(*b64str == '\r' || *b64str == '\n' || !(strict)){
|
||||
b64str++; /* charcters that we simply ignore */
|
||||
}else{
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
if(term)
|
||||
return -1; /* this happens if we get a '=' in the stream */
|
||||
idx++;
|
||||
b64str++;
|
||||
}
|
||||
if(idx==4){
|
||||
((uint8_t*)dest)[0] = buffer[0]<<2 | buffer[1]>>4;
|
||||
((uint8_t*)dest)[1] = buffer[1]<<4 | buffer[2]>>2;
|
||||
((uint8_t*)dest)[2] = buffer[2]<<6 | buffer[3];
|
||||
dest = (uint8_t*)dest +3;
|
||||
idx=0;
|
||||
}
|
||||
}
|
||||
finalize:
|
||||
/* the final touch */
|
||||
if(idx==0)
|
||||
return 0;
|
||||
if(term==1){
|
||||
((uint8_t*)dest)[0] = buffer[0]<<2 | buffer[1]>>4;
|
||||
((uint8_t*)dest)[1] = buffer[1]<<4 | buffer[2]>>2;
|
||||
return 0;
|
||||
}
|
||||
if(term==2){
|
||||
((uint8_t*)dest)[0] = buffer[0]<<2 | buffer[1]>>4;
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
/* base64_dec.h */
|
||||
/*
|
||||
* This file is part of the AVR-Crypto-Lib.
|
||||
* Copyright (C) 2006, 2007, 2008 Daniel Otte (daniel.otte@rub.de)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef BASE64_DEC_H_
|
||||
#define BASE64_DEC_H_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
int base64_binlength(char* str, uint8_t strict);
|
||||
int base64dec(void* dest, char* b64str, uint8_t strict);
|
||||
|
||||
#endif /*BASE64_DEC_H_*/
|
||||
|
|
@ -0,0 +1,117 @@
|
|||
/* base64_enc.c */
|
||||
/*
|
||||
* This file is part of the AVR-Crypto-Lib.
|
||||
* Copyright (C) 2006, 2007, 2008 Daniel Otte (daniel.otte@rub.de)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* base64 encoder (RFC3548)
|
||||
* Author: Daniel Otte
|
||||
* License: GPLv3
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include "base64_enc.h"
|
||||
|
||||
#if 1
|
||||
#include <avr/pgmspace.h>
|
||||
|
||||
char base64_alphabet[64] PROGMEM = {
|
||||
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
|
||||
'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
|
||||
'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
|
||||
'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
|
||||
'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
|
||||
'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
|
||||
'w', 'x', 'y', 'z', '0', '1', '2', '3',
|
||||
'4', '5', '6', '7', '8', '9', '+', '/' };
|
||||
|
||||
static
|
||||
char bit6toAscii(uint8_t a){
|
||||
a &= (uint8_t)0x3F;
|
||||
return pgm_read_byte(base64_alphabet+a);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
static
|
||||
char bit6toAscii(uint8_t a){
|
||||
a &= (uint8_t)0x3F;
|
||||
|
||||
if(a<=25){
|
||||
return a+'A';
|
||||
} else {
|
||||
if(a<=51){
|
||||
return a-26+'a';
|
||||
} else {
|
||||
if(a<=61){
|
||||
return a-52+'0';
|
||||
} else {
|
||||
if(a==62){
|
||||
return '+';
|
||||
} else {
|
||||
return '/'; /* a == 63 */
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
void base64enc(char* dest, void* src, uint16_t length){
|
||||
uint16_t i,j;
|
||||
uint8_t a[4];
|
||||
for(i=0; i<length/3; ++i){
|
||||
a[0]= (((uint8_t*)src)[i*3+0])>>2;
|
||||
a[1]= (((((uint8_t*)src)[i*3+0])<<4) | ((((uint8_t*)src)[i*3+1])>>4)) & 0x3F;
|
||||
a[2]= (((((uint8_t*)src)[i*3+1])<<2) | ((((uint8_t*)src)[i*3+2])>>6)) & 0x3F;
|
||||
a[3]= (((uint8_t*)src)[i*3+2]) & 0x3F;
|
||||
for(j=0; j<4; ++j){
|
||||
*dest++=bit6toAscii(a[j]);
|
||||
}
|
||||
}
|
||||
/* now we do the rest */
|
||||
switch(length%3){
|
||||
case 0:
|
||||
break;
|
||||
case 1:
|
||||
a[0]=(((uint8_t*)src)[i*3+0])>>2;
|
||||
a[1]=((((uint8_t*)src)[i*3+0])<<4)&0x3F;
|
||||
*dest++ = bit6toAscii(a[0]);
|
||||
*dest++ = bit6toAscii(a[1]);
|
||||
*dest++ = '=';
|
||||
*dest++ = '=';
|
||||
break;
|
||||
case 2:
|
||||
a[0]= (((uint8_t*)src)[i*3+0])>>2;
|
||||
a[1]= (((((uint8_t*)src)[i*3+0])<<4) | ((((uint8_t*)src)[i*3+1])>>4)) & 0x3F;
|
||||
a[2]= ((((uint8_t*)src)[i*3+1])<<2) & 0x3F;
|
||||
*dest++ = bit6toAscii(a[0]);
|
||||
*dest++ = bit6toAscii(a[1]);
|
||||
*dest++ = bit6toAscii(a[2]);
|
||||
*dest++ = '=';
|
||||
break;
|
||||
default: /* this will not happen! */
|
||||
break;
|
||||
}
|
||||
/* finalize: */
|
||||
*dest='\0';
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
/* base64_enc.h */
|
||||
/*
|
||||
* This file is part of the AVR-Crypto-Lib.
|
||||
* Copyright (C) 2006, 2007, 2008 Daniel Otte (daniel.otte@rub.de)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef BASE64_ENC_H_
|
||||
#define BASE64_ENC_H_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
void base64enc(char* dest, void* src, uint16_t length);
|
||||
|
||||
#endif /*BASE64_ENC_H_*/
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
# Makefile for noekeon
|
||||
ALGO_NAME := BASE64
|
||||
|
||||
# comment out the following line for removement of base64 from the build process
|
||||
ENCODINGS += $(ALGO_NAME)
|
||||
|
||||
|
||||
$(ALGO_NAME)_OBJ := base64_enc.o base64_dec.o
|
||||
$(ALGO_NAME)_TEST_BIN := main-base64-test.o debug.o uart.o hexdigit_tab.o serial-tools.o \
|
||||
cli.o string-extras.o performance_test.o noekeon_asm.o noekeon_prng.o \
|
||||
memxor.o
|
||||
|
||||
$(ALGO_NAME)_PERFORMANCE_TEST := performance
|
||||
|
||||
|
|
@ -0,0 +1,165 @@
|
|||
/* main-base64-test.c */
|
||||
/*
|
||||
This file is part of the AVR-Crypto-Lib.
|
||||
Copyright (C) 2008, 2009 Daniel Otte (daniel.otte@rub.de)
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program 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 General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
* base64 test-suit
|
||||
*
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "serial-tools.h"
|
||||
#include "uart.h"
|
||||
#include "debug.h"
|
||||
|
||||
#include "noekeon.h"
|
||||
#include "noekeon_prng.h"
|
||||
#include "base64_enc.h"
|
||||
#include "base64_dec.h"
|
||||
|
||||
#include "cli.h"
|
||||
#include "performance_test.h"
|
||||
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
char* algo_name = "Base64";
|
||||
|
||||
/*****************************************************************************
|
||||
* additional validation-functions *
|
||||
*****************************************************************************/
|
||||
|
||||
void testrun_stdtest_base64(void){
|
||||
uint8_t fail=0;
|
||||
uint8_t l,i;
|
||||
int sl;
|
||||
char str[10];
|
||||
uint8_t bin_buffer[256];
|
||||
char b64_buffer[256*4/3+10];
|
||||
uint8_t bin_buffer2[256];
|
||||
random_seed(bin_buffer);
|
||||
|
||||
for(l=0; l<255; ++l){
|
||||
cli_putstr_P(PSTR("\r\nTest "));
|
||||
utoa(l, str, 10);
|
||||
cli_putstr(str);
|
||||
|
||||
for(i=0; i<l; ++i){
|
||||
bin_buffer[i] = random8();
|
||||
}
|
||||
cli_putstr_P(PSTR("\r\n bin: "));
|
||||
cli_hexdump(bin_buffer, l);
|
||||
|
||||
base64enc(b64_buffer, bin_buffer, l);
|
||||
cli_putstr_P(PSTR("\r\n b64: "));
|
||||
cli_putstr(b64_buffer);
|
||||
|
||||
sl = base64_binlength(b64_buffer, 1);
|
||||
|
||||
if(sl!=l){
|
||||
cli_putstr_P(PSTR("\r\n ERROR length "));
|
||||
cli_putstr(str);
|
||||
if(sl!=-1){
|
||||
cli_putstr_P(PSTR(" != "));
|
||||
utoa(sl, str, 10);
|
||||
cli_putstr(str);
|
||||
}else{
|
||||
cli_putstr_P(PSTR(" != -1"));
|
||||
}
|
||||
fail=1;
|
||||
}else{
|
||||
cli_putstr_P(PSTR("\r\n length ok"));
|
||||
}
|
||||
base64dec(bin_buffer2, b64_buffer, 1);
|
||||
if(memcmp(bin_buffer, bin_buffer2, l)){
|
||||
cli_putstr_P(PSTR("\r\n ERROR value\r\n out: "));
|
||||
cli_hexdump(bin_buffer2, l);
|
||||
fail=1;
|
||||
}else{
|
||||
cli_putstr_P(PSTR("\r\n value ok"));
|
||||
}
|
||||
if(fail)
|
||||
break;
|
||||
}
|
||||
cli_putstr_P(fail?PSTR("\r\n [FAIL]\r\n"):PSTR("\r\n [OK]\r\n"));
|
||||
}
|
||||
|
||||
void testrun_performance_base64(void){
|
||||
/*
|
||||
uint64_t t;
|
||||
char str[16];
|
||||
uint8_t key[16], data[16];
|
||||
noekeon_ctx_t ctx;
|
||||
|
||||
calibrateTimer();
|
||||
print_overhead();
|
||||
|
||||
memset(key, 0, 16);
|
||||
memset(data, 0, 16);
|
||||
|
||||
startTimer(1);
|
||||
noekeon_init(key, &ctx);
|
||||
t = stopTimer();
|
||||
cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
|
||||
ultoa((unsigned long)t, str, 10);
|
||||
cli_putstr(str);
|
||||
|
||||
startTimer(1);
|
||||
noekeon_enc(data, &ctx);
|
||||
t = stopTimer();
|
||||
cli_putstr_P(PSTR("\r\n\tencrypt time: "));
|
||||
ultoa((unsigned long)t, str, 10);
|
||||
cli_putstr(str);
|
||||
|
||||
startTimer(1);
|
||||
noekeon_dec(data, &ctx);
|
||||
t = stopTimer();
|
||||
cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
|
||||
ultoa((unsigned long)t, str, 10);
|
||||
cli_putstr(str);
|
||||
|
||||
cli_putstr_P(PSTR("\r\n"));
|
||||
*/
|
||||
}
|
||||
/*****************************************************************************
|
||||
* main *
|
||||
*****************************************************************************/
|
||||
|
||||
const char test_str[] PROGMEM = "test";
|
||||
const char performance_str[] PROGMEM = "performance";
|
||||
const char echo_str[] PROGMEM = "echo";
|
||||
|
||||
cmdlist_entry_t cmdlist[] PROGMEM = {
|
||||
{ test_str, NULL, testrun_stdtest_base64},
|
||||
{ performance_str, NULL, testrun_performance_base64},
|
||||
{ echo_str, (void*)1, (void_fpt)echo_ctrl},
|
||||
{ NULL, NULL, NULL}
|
||||
};
|
||||
|
||||
int main (void){
|
||||
DEBUG_INIT();
|
||||
|
||||
cli_rx = uart_getc;
|
||||
cli_tx = uart_putc;
|
||||
for(;;){
|
||||
cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
|
||||
cli_putstr(algo_name);
|
||||
cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
|
||||
cmd_interface(cmdlist);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue