From c6031882e983e60fb31a9e73a1ccb32a90f4bbfa Mon Sep 17 00:00:00 2001 From: Jongmin Choi Date: Thu, 15 Dec 2016 17:40:36 +0900 Subject: [PATCH] Restore rootca.crt in provisioning sample Revert https://gerrit.iotivity.org/gerrit/#/c/15451/ and restore rootca.crt in provisioning sample due to Tizen gbsbuild error Patch #1: Initial upload Change-Id: I4691a7bbce822a1cd342c9aa874d3fb8a0fa0a29 Signed-off-by: Jongmin Choi Reviewed-on: https://gerrit.iotivity.org/gerrit/15689 Reviewed-by: Jongsung Lee Tested-by: jenkins-iotivity Reviewed-by: Randeep Singh (cherry picked from commit c0645c683cf5f2978824b177f9f58bcb790a8462) Reviewed-on: https://gerrit.iotivity.org/gerrit/16097 --- .../csdk/security/provisioning/sample/SConscript | 3 +-- .../csdk/security/provisioning/sample/rootca.crt | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 resource/csdk/security/provisioning/sample/rootca.crt diff --git a/resource/csdk/security/provisioning/sample/SConscript b/resource/csdk/security/provisioning/sample/SConscript index 65942ca..5222593 100644 --- a/resource/csdk/security/provisioning/sample/SConscript +++ b/resource/csdk/security/provisioning/sample/SConscript @@ -118,7 +118,6 @@ if provisioning_env.get('WITH_TCP') == True: cloudServer = provisioning_env.Program('cloudServer', cloud_src + ['cloudServer.c', 'cloud/cloudResource.c']) src_dir = provisioning_env.get('SRC_DIR') -cloud_cert_dir = src_dir + '/cloud/certificate/' sec_provisioning_src_dir = src_dir + '/resource/csdk/security/provisioning/sample/' sec_provisioning_build_dir = env.get('BUILD_DIR') +'/resource/csdk/security/provisioning/sample/' @@ -146,7 +145,7 @@ if provisioning_env.get('WITH_TCP') == True: clouddat = provisioning_env.Install(sec_provisioning_build_dir, sec_provisioning_src_dir + 'cloud.dat') rootcert = provisioning_env.Install(sec_provisioning_build_dir, - cloud_cert_dir + 'rootca.crt') + sec_provisioning_src_dir + 'rootca.crt') Alias("cloud", [clouddat, rootcert, cloudClient, cloudServer]) provisioning_env.AppendTarget("cloud") diff --git a/resource/csdk/security/provisioning/sample/rootca.crt b/resource/csdk/security/provisioning/sample/rootca.crt new file mode 100644 index 0000000..ee80fa4 --- /dev/null +++ b/resource/csdk/security/provisioning/sample/rootca.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDjDCCAnQCAQEwDQYJKoZIhvcNAQELBQAwgYsxCzAJBgNVBAYTAktSMQ4wDAYD +VQQIDAVTZW91bDEPMA0GA1UEBwwGVW15ZW9uMREwDwYDVQQKDAhTYW1zdW5nIDEU +MBIGA1UECwwLT0NGIFJvb3QgQ0ExMjAwBgNVBAMMKXV1aWQ6MzEzMTMxMzEtMzEz +MS0zMTMxLTMxMzEtMzEzMTMxMzEzMTMxMB4XDTE2MTAyODA0MjEyMloXDTI2MTAy +NjA0MjEyMlowgYsxCzAJBgNVBAYTAktSMQ4wDAYDVQQIDAVTZW91bDEPMA0GA1UE +BwwGVW15ZW9uMREwDwYDVQQKDAhTYW1zdW5nIDEUMBIGA1UECwwLT0NGIFJvb3Qg +Q0ExMjAwBgNVBAMMKXV1aWQ6MzEzMTMxMzEtMzEzMS0zMTMxLTMxMzEtMzEzMTMx +MzEzMTMxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3EJwn+NfeW9Y +RLDoOUSg45AvkqsMeNBv8ZTqWyY5nAeyESQsDejacm6dSpzMP/p5y1KBWYszKOXr +CUtrkch8VxOtt4egiv3Tschl16W1W7ril8EEbX8zoEcuExfoLdPZhDtRl8ROdG3t +NE0r/Fv5ubTEwW0K3JgIwykB4OAsO2aQtCuZ32cZlg5UcW3LAXpxJ7cEkMR2xhcN +xbg0dgbyy5BiWit3grXXJBkopq/ADCRUIVzpLjxeFTVshWw9+AA1IUZaG64fkbLG +pzdYFVsuRvMlyEwWrMm23/hT8x0eywvPX5k/N1s6I0KiE8FitVi5bgUph3iCNLE/ +1a/oLrtWyQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQDHq9X9YofW3IN8R61r0raN +tacYMumZFZfPOEcHHGvTkPrMygUNfTM+g6XEzOvlBB4dd6UE5EsVnRkQP0wvaaJx +3Js/zQMkAXeVRzDg/YowynuG+t4VvoQl/1uNDUKjU9z+yv+vQjNctzeKhvAJxWGO +ZtpgIslUhMtGBjWQDNd2APf8yOcD50yVwUpcp4WGbqaaKxn+rixu8jk1NEas0EHD +XBytAgEdOeBQplv6W+W1fG3j0PMolkWaPIvjSvMk0m11h4GR5Kyx3gRQS74gurG/ +DboAZ+DJMe7hMh4coOwnOuS8euPtxEPD3IkYVAT4aFPIvTkiri0EYimgtQd+M45f +-----END CERTIFICATE----- -- 2.7.4