Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
afm-urun: Fix infinite loop on start status
[src/app-framework-main.git]
/
src
/
secmgr-wrap.c
diff --git
a/src/secmgr-wrap.c
b/src/secmgr-wrap.c
index
87aa5a5
..
63704ef
100644
(file)
--- a/
src/secmgr-wrap.c
+++ b/
src/secmgr-wrap.c
@@
-1,5
+1,7
@@
/*
/*
- Copyright 2015 IoT.bzh
+ Copyright (C) 2015-2020 IoT.bzh
+
+ author: José Bollo <jose.bollo@iot.bzh>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@
-18,7
+20,11
@@
#include <errno.h>
#include <assert.h>
#include <errno.h>
#include <assert.h>
+#if SIMULATE_SECURITY_MANAGER
+#include "simulation/security-manager.h"
+#else
#include <security-manager.h>
#include <security-manager.h>
+#endif
#include "verbose.h"
#include "secmgr-wrap.h"
#include "verbose.h"
#include "secmgr-wrap.h"
@@
-34,7
+40,7
@@
static int retcode(enum lib_retcode rc)
case SECURITY_MANAGER_ERROR_REQ_NOT_COMPLETE: errno = EBADMSG; break;
case SECURITY_MANAGER_ERROR_AUTHENTICATION_FAILED: errno = EPERM; break;
case SECURITY_MANAGER_ERROR_ACCESS_DENIED: errno = EACCES; break;
case SECURITY_MANAGER_ERROR_REQ_NOT_COMPLETE: errno = EBADMSG; break;
case SECURITY_MANAGER_ERROR_AUTHENTICATION_FAILED: errno = EPERM; break;
case SECURITY_MANAGER_ERROR_ACCESS_DENIED: errno = EACCES; break;
- default: errno =
0
; break;
+ default: errno =
ECANCELED
; break;
}
return -1;
}
}
return -1;
}
@@
-78,6
+84,17
@@
int secmgr_install()
return retcode(rc);
}
return retcode(rc);
}
+int secmgr_uninstall()
+{
+ int rc;
+ assert(request != NULL);
+ rc = security_manager_app_uninstall(request);
+ if (rc != SECURITY_MANAGER_SUCCESS)
+ ERROR("security_manager_app_uninstall failed");
+ secmgr_cancel();
+ return retcode(rc);
+}
+
int secmgr_permit(const char *permission)
{
int rc;
int secmgr_permit(const char *permission)
{
int rc;
@@
-100,7
+117,7
@@
static int addpath(const char *pathname, enum app_install_path_type type)
int secmgr_path_public_read_only(const char *pathname)
{
int secmgr_path_public_read_only(const char *pathname)
{
- return addpath(pathname, SECURITY_MANAGER_PATH_
PUBLIC_
RO);
+ return addpath(pathname, SECURITY_MANAGER_PATH_RO);
}
int secmgr_path_read_only(const char *pathname)
}
int secmgr_path_read_only(const char *pathname)
@@
-113,3
+130,8
@@
int secmgr_path_read_write(const char *pathname)
return addpath(pathname, SECURITY_MANAGER_PATH_RW);
}
return addpath(pathname, SECURITY_MANAGER_PATH_RW);
}
+int secmgr_prepare_exec(const char *appid)
+{
+ return retcode(security_manager_prepare_app(appid));
+}
+