Expose security profiles resource in all builds

Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>

api/oc_discovery.c

@@ -165,11 +165,11 @@ process_device_resources(CborEncoder *links, oc_request_t *request,
                       request, oc_string(anchor), links))
     matches++;
 
-#ifdef OC_PKI
   if (filter_resource(oc_core_get_resource_by_index(OCF_SEC_SP, device_index),
                       request, oc_string(anchor), links))
     matches++;
 
+#ifdef OC_PKI
   if (filter_resource(oc_core_get_resource_by_index(OCF_SEC_CSR, device_index),
                       request, oc_string(anchor), links))
     matches++;
@@ -389,11 +389,11 @@ process_oic_1_1_device_object(CborEncoder *device, oc_request_t *request,
         oc_rep_array(links)))
     matches++;
 
-#ifdef OC_PKI
   if (filter_oic_1_1_resource(
         oc_core_get_resource_by_index(OCF_SEC_SP, device_num), request,
         oc_rep_array(links)))
     matches++;
+#ifdef OC_PKI
   if (filter_oic_1_1_resource(
         oc_core_get_resource_by_index(OCF_SEC_CSR, device_num), request,
         oc_rep_array(links)))

include/oc_ri.h

@@ -108,8 +108,8 @@ typedef enum {
   OCF_SEC_PSTAT,
   OCF_SEC_ACL,
   OCF_SEC_CRED,
-#ifdef OC_PKI
   OCF_SEC_SP,
+#ifdef OC_PKI
   OCF_SEC_CSR,
   OCF_SEC_ROLES,
 #endif /* OC_PKI */

security/oc_sp.c

@@ -15,7 +15,6 @@
 */
 
 #ifdef OC_SECURITY
-#ifdef OC_PKI
 #include "oc_sp.h"
 #include "oc_api.h"
 #include "oc_core_res.h"
@@ -229,7 +228,4 @@ post_sp(oc_request_t *request, oc_interface_mask_t iface_mask, void *data)
   }
 }
 
-#else  /* OC_PKI */
-typedef int dummy_declaration;
-#endif /* !OC_PKI */
 #endif /* OC_SECURITY */

security/oc_svr.c

@@ -57,10 +57,11 @@ oc_sec_create_svr(void)
                               OC_IF_BASELINE, OC_DISCOVERABLE | OC_SECURE,
                               get_cred, 0, post_cred, delete_cred, 1,
                               "oic.r.cred");
-#ifdef OC_PKI
+
     oc_core_populate_resource(OCF_SEC_SP, i, "/oic/sec/sp", OC_IF_BASELINE,
                               OC_IF_BASELINE, OC_DISCOVERABLE | OC_SECURE,
                               get_sp, 0, post_sp, 0, 1, "oic.r.sp");
+#ifdef OC_PKI
     oc_core_populate_resource(OCF_SEC_CSR, i, "/oic/sec/csr", OC_IF_BASELINE,
                               OC_IF_BASELINE, OC_DISCOVERABLE | OC_SECURE,
                               get_csr, 0, 0, 0, 1, "oic.r.csr");