Crypto API cleanup.

include/Makefile.am

@@ -64,7 +64,6 @@ PRETTY_SUBDIRS                          = \
 include_HEADERS                         = \
     openthread/link_raw.h                 \
     openthread.h                          \
-    openthread-crypto.h                   \
     openthread-diag.h                     \
     openthread-icmp6.h                    \
     openthread-ip6.h                      \

include/openthread.h

@@ -37,6 +37,7 @@
 
 #include <openthread-types.h>
 
+#include "openthread/crypto.h"
 #include "openthread/message.h"
 #include "openthread/tasklet.h"
 

include/openthread/Makefile.am

@@ -30,6 +30,7 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
 
 openthread_headers                      = \
     coap.h                                \
+    crypto.h                              \
     message.h                             \
     tasklet.h                             \
     udp.h                                 \

src/core/Makefile.am

@@ -40,6 +40,7 @@ CPPFLAGS_COMMON                     = \
 
 SOURCES_COMMON                      = \
     openthread.cpp                    \
+    api/crypto_api.cpp                \
     api/message_api.cpp               \
     api/tasklet_api.cpp               \
     api/udp_api.cpp                   \
@@ -57,7 +58,6 @@ SOURCES_COMMON                      = \
     crypto/aes_ccm.cpp                \
     crypto/aes_ecb.cpp                \
     crypto/hmac_sha256.cpp            \
-    crypto/openthread-crypto.cpp      \
     crypto/mbedtls.cpp                \
     crypto/sha256.cpp                 \
     mac/mac.cpp                       \

src/core/api/crypto_api.cpp

@@ -28,15 +28,15 @@
 
 /**
  * @file
- *   This file implements the C APIs for openthread crypto library.
+ *   This file implements the OpenThread Crypto API.
  */
 
-#include <openthread.h>
-#include <common/debug.hpp>
-#include <common/code_utils.hpp>
-#include <openthread-crypto.h>
-#include <crypto/hmac_sha256.hpp>
-#include <crypto/aes_ccm.hpp>
+#include "openthread/crypto.h"
+
+#include "common/debug.hpp"
+#include "common/code_utils.hpp"
+#include "crypto/hmac_sha256.hpp"
+#include "crypto/aes_ccm.hpp"
 
 using namespace Thread::Crypto;