Mercurial > pihelp
changeset 8:03da5ff767e9
Some debug ifdefs
Decrypt should use the next key for cli auth (Decrpyt is incorrect)
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Thu, 06 Jun 2013 00:04:48 +0800 |
parents | 76f3ed943180 |
children | 3aa92c7f379c |
files | main.c pihelp.atsln pihelp.atsuo pihelp.cproj |
diffstat | 4 files changed, 195 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/main.c Wed Jun 05 23:08:08 2013 +0800 +++ b/main.c Thu Jun 06 00:04:48 2013 +0800 @@ -186,8 +186,13 @@ //TCCR2A = _BV(COM2A1) | _BV(COM2A0) | _BV(WGM21); // toggle on match TCCR1A = _BV(COM1A0); +#ifdef SIM_DEBUG + // systemclock/8 + TCCR1B = _BV(CS11); +#else // systemclock/64 TCCR1B = _BV(CS11) | _BV(CS10); +#endif TCNT1 = 0; OCR1A = SLEEP_COMPARE; // interrupt @@ -408,7 +413,9 @@ return; } memcpy(avr_keys[key_index], new_key, sizeof(new_key)); +#ifndef SIM_DEBUG eeprom_write(avr_keys, avr_keys); +#endif } static void @@ -429,7 +436,9 @@ return; } +#ifndef SIM_DEBUG long_delay(200); +#endif hmac_sha1(outdata, avr_keys[key_index], KEYLEN*8, indata, HMACLEN*8); @@ -456,11 +465,12 @@ return; } +#ifndef SIM_DEBUG long_delay(200); - +#endif // check the signature - hmac_sha1(output, avr_keys[key_index], KEYLEN*8, &data[HMACLEN], AESLEN*8); + hmac_sha1(output, avr_keys[key_index+1], KEYLEN*8, &data[HMACLEN], AESLEN*8); if (memcmp(output, data, HMACLEN) != 0) { printf_P(PSTR("FAIL: hmac mismatch\n")); @@ -792,6 +802,13 @@ sei(); +#if 0 + // encryption test + cmd_set_avr_key("1 6161626263636464656566666767686800000000"); + cmd_set_avr_key("2 7979757569696f6f646465656666717164646969"); + cmd_decrypt("1 ecd858ee07a8e16575723513d2d072a7565865e40ba302059bfc650d4491268448102119"); +#endif + // doesn't return do_comms();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pihelp.atsln Thu Jun 06 00:04:48 2013 +0800 @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Atmel Studio Solution File, Format Version 11.00 +Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "pihelp", "pihelp.cproj", "{4DE891F7-343E-4919-A547-808A4AAE3A39}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|AVR = Debug|AVR + Release|AVR = Release|AVR + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4DE891F7-343E-4919-A547-808A4AAE3A39}.Debug|AVR.ActiveCfg = Debug|AVR + {4DE891F7-343E-4919-A547-808A4AAE3A39}.Debug|AVR.Build.0 = Debug|AVR + {4DE891F7-343E-4919-A547-808A4AAE3A39}.Release|AVR.ActiveCfg = Release|AVR + {4DE891F7-343E-4919-A547-808A4AAE3A39}.Release|AVR.Build.0 = Release|AVR + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pihelp.cproj Thu Jun 06 00:04:48 2013 +0800 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <SchemaVersion>2.0</SchemaVersion> + <ProjectVersion>6.1</ProjectVersion> + <ToolchainName>com.Atmel.AVRGCC8.C</ToolchainName> + <ProjectGuid>{4de891f7-343e-4919-a547-808a4aae3a39}</ProjectGuid> + <avrdevice>ATmega328P</avrdevice> + <avrdeviceseries>none</avrdeviceseries> + <OutputType>Executable</OutputType> + <Language>C</Language> + <OutputFileName>$(MSBuildProjectName)</OutputFileName> + <OutputFileExtension>.elf</OutputFileExtension> + <OutputDirectory>$(MSBuildProjectDirectory)\$(Configuration)</OutputDirectory> + <AssemblyName>pihelp</AssemblyName> + <Name>pihelp</Name> + <RootNamespace>pihelp</RootNamespace> + <ToolchainFlavour>Native</ToolchainFlavour> + <KeepTimersRunning>true</KeepTimersRunning> + <OverrideVtor>false</OverrideVtor> + <OverrideVtorValue> + </OverrideVtorValue> + <eraseonlaunchrule>0</eraseonlaunchrule> + <ProgFlashFromRam>true</ProgFlashFromRam> + <RamSnippetAddress>0x20000000</RamSnippetAddress> + <CacheFlash>true</CacheFlash> + <UncachedRange /> + <BootSegment>2</BootSegment> + <AsfFrameworkConfig> + <framework-data xmlns=""> + <options /> + <configurations /> + <files /> + <documentation help="" /> + <offline-documentation help="" /> + <dependencies> + <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.8.1" /> + </dependencies> + </framework-data> + </AsfFrameworkConfig> + <avrtoolinterface /> + <avrtool>com.atmel.avrdbg.tool.simulator</avrtool> + <com_atmel_avrdbg_tool_simulator> + <ToolType xmlns="">com.atmel.avrdbg.tool.simulator</ToolType> + <ToolName xmlns="">Simulator</ToolName> + <ToolNumber xmlns=""> + </ToolNumber> + <StimuliFile xmlns=""> + </StimuliFile> + <Channel xmlns=""> + <host>127.0.0.1</host> + <port>52727</port> + <ssl>False</ssl> + </Channel> + </com_atmel_avrdbg_tool_simulator> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> + <ToolchainSettings> + <AvrGcc> + <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex> + <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss> + <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep> + <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec> + <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned> + <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned> + <avrgcc.compiler.symbols.DefSymbols> + <ListValues> + <Value>NDEBUG</Value> + </ListValues> + </avrgcc.compiler.symbols.DefSymbols> + <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level> + <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers> + <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum> + <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings> + <avrgcc.linker.libraries.Libraries> + <ListValues> + <Value>libm</Value> + </ListValues> + </avrgcc.linker.libraries.Libraries> + </AvrGcc> + </ToolchainSettings> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> + <ToolchainSettings> + <AvrGcc> + <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex> + <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss> + <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep> + <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec> + <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned> + <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned> + <avrgcc.compiler.symbols.DefSymbols> + <ListValues> + <Value>DEBUG</Value> + </ListValues> + </avrgcc.compiler.symbols.DefSymbols> + <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers> + <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum> + <avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel> + <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings> + <avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -DSIM_DEBUG</avrgcc.compiler.miscellaneous.OtherFlags> + <avrgcc.linker.libraries.Libraries> + <ListValues> + <Value>libm</Value> + </ListValues> + </avrgcc.linker.libraries.Libraries> + <avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel> +</AvrGcc> + </ToolchainSettings> + </PropertyGroup> + <ItemGroup> + <Compile Include="aes.c"> + <SubType>compile</SubType> + </Compile> + <Compile Include="cli.h"> + <SubType>compile</SubType> + </Compile> + <Compile Include="config.h"> + <SubType>compile</SubType> + </Compile> + <Compile Include="crc8.c"> + <SubType>compile</SubType> + </Compile> + <Compile Include="crc8.h"> + <SubType>compile</SubType> + </Compile> + <Compile Include="debug.h"> + <SubType>compile</SubType> + </Compile> + <Compile Include="ds18x20.h"> + <SubType>compile</SubType> + </Compile> + <Compile Include="hmac-sha1.c"> + <SubType>compile</SubType> + </Compile> + <Compile Include="hmac-sha1.h"> + <SubType>compile</SubType> + </Compile> + <Compile Include="main.c"> + <SubType>compile</SubType> + </Compile> + <Compile Include="onewire.c"> + <SubType>compile</SubType> + </Compile> + <Compile Include="onewire.h"> + <SubType>compile</SubType> + </Compile> + <Compile Include="sha1.c"> + <SubType>compile</SubType> + </Compile> + <Compile Include="sha1.h"> + <SubType>compile</SubType> + </Compile> + </ItemGroup> + <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" /> +</Project> \ No newline at end of file