commit 4662a114a416e636de805fbd875f8b90fc5965b9
author Szymon Starzycki <sstar@google.com> Wed Oct 02 17:21:41 2013 -0700
committer Colin Cross <ccross@android.com> Wed Dec 04 15:00:52 2013 -0800
tree cd62973e812f8f2972893ba2ef4dc405192258c6
parent 27ea99fb99153e3b2d45efd6fce9785538469e49

Revert "Revert "Fastbootd: flashing certification""

CMS functionality is now available

This reverts commit 068b71dd9cd6cb03dfcdc0c9deced361780bc0d3.

Conflicts:
	fastbootd/Android.mk
	fastbootd/fastbootd.c
	fastbootd/utils.c
	fastbootd/utils.h

Change-Id: I1a27459b41d9297603deb124c65f237ff971e5b6

fastbootd/fastbootd.c

diff --git a/fastbootd/fastbootd.c b/fastbootd/fastbootd.c
index 085cbfa..9318c99 100644
--- a/fastbootd/fastbootd.c
+++ b/fastbootd/fastbootd.c
@@ -23,6 +23,7 @@
 #include "debug.h"
 #include "trigger.h"
 #include "socket_client.h"
+#include "secure.h"
 
 unsigned int debug_level = DEBUG;
 
@@ -72,6 +73,7 @@
         run_socket_client();
     }
     else {
+        cert_init_crypto();
         config_init();
         load_trigger();
         commands_init();