Merge pull request #3 from reissjason/patch-1

mluis1 · mluis1 · commit 5eeadd91a393 · 2015-04-30T17:49:25.000+02:00
Patch merged. Thanks for the correction.
diff --git a/src/mac/LoRaMacCrypto.c b/src/mac/LoRaMacCrypto.c
@@ -166,7 +166,7 @@ void LoRaMacJoinComputeMic( uint8_t *buffer, uint16_t size, const uint8_t *key,
 void LoRaMacJoinDecrypt( uint8_t *buffer, uint16_t size, const uint8_t *key, uint8_t *decBuffer )
 {
     memset1( AesContext.ksch, '\0', 240 );
-    aes_set_key( key, size, &AesContext );
+    aes_set_key( key, 16, &AesContext );
     aes_encrypt( buffer, decBuffer, &AesContext );
     // Check if optional CFList is included
     if( size >= 16 )

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ void LoRaMacJoinComputeMic( uint8_t buffer, uint16_t size, const uint8_t key,`
`166`	`166`	`void LoRaMacJoinDecrypt( uint8_t buffer, uint16_t size, const uint8_t key, uint8_t *decBuffer )`
`167`	`167`	`{`
`168`	`168`	`memset1( AesContext.ksch, '\0', 240 );`
`169`		`- aes_set_key( key, size, &AesContext );`
	`169`	`+ aes_set_key( key, 16, &AesContext );`
`170`	`170`	`aes_encrypt( buffer, decBuffer, &AesContext );`
`171`	`171`	`// Check if optional CFList is included`
`172`	`172`	`if( size >= 16 )`