lzbp li / LoRaWAN-lib-test

调试版本，多个调试标识，接收时有bug

Fork of LoRaWAN-lib by Semtech

Diff: LoRaMacCrypto.cpp

Revision:
2:14a5d6ad92d5
Parent:
1:91e4e6c60d1e
--- a/LoRaMacCrypto.cpp	Mon Nov 23 10:09:43 2015 +0000
+++ b/LoRaMacCrypto.cpp	Tue Jan 05 16:41:54 2016 +0000
@@ -5,12 +5,17 @@
  _____) ) ____| | | || |_| ____( (___| | | |
 (______/|_____)_|_|_| \__)_____)\____)_| |_|
     (C)2013 Semtech
+ ___ _____ _   ___ _  _____ ___  ___  ___ ___
+/ __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+\__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+|___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+embedded.connectivity.solutions===============
 
 Description: LoRa MAC layer implementation
 
 License: Revised BSD License, see LICENSE.TXT file include in the project
 
-Maintainer: Miguel Luis and Gregory Cristian
+Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jäckle ( STACKFORCE )
 */
 #include <stdlib.h>
 #include <stdint.h>
@@ -185,13 +190,13 @@
 
     memset1( nonce, 0, sizeof( nonce ) );
     nonce[0] = 0x01;
-    LoRaMacMemCpy( appNonce, nonce + 1, 6 );
-    LoRaMacMemCpy( pDevNonce, nonce + 7, 2 );
+    memcpy1( nonce + 1, appNonce, 6 );
+    memcpy1( nonce + 7, pDevNonce, 2 );
     aes_encrypt( nonce, nwkSKey, &AesContext );
 
     memset1( nonce, 0, sizeof( nonce ) );
     nonce[0] = 0x02;
-    LoRaMacMemCpy( appNonce, nonce + 1, 6 );
-    LoRaMacMemCpy( pDevNonce, nonce + 7, 2 );
+    memcpy1( nonce + 1, appNonce, 6 );
+    memcpy1( nonce + 7, pDevNonce, 2 );
     aes_encrypt( nonce, appSKey, &AesContext );
 }