Various changes; also implement binary tree complement calculation

1 files changed, 1 insertions, 35 deletions

diff --git a/service_provider.h b/service_provider.h
index ec12aaa..883c9ea 100644
--- a/service_provider.h
+++ b/service_provider.h
@@ -9,41 +9,7 @@
 
 struct service_provider;
 
-struct user_request {
-    int idx;
-    int user_id; /* user id */
-    enum { ACL_UPDATE, FILE_UPDATE } type;
-    int counter;
-    hash_t val; /* for ACL update, val=[root of ACL IOMT], for file
-                 * update, val is a commitment to the contents, key,
-                 * and index of the file */
-    union {
-        /* if counter = 0 and type = ACL_UPDATE, create a new file with given ACL */
-        struct {
-            struct tm_cert ru_cert;
-            hash_t ru_hmac;
-        } create;
-
-        /* otherwise the request is to modify either the file or
-         * ACL */
-        struct {
-            /* FR certificate verifying file ACL and counter */
-            struct tm_cert fr_cert;
-            hash_t fr_hmac;
-
-            /* RV certificate verifying that user is in the ACL */
-            struct tm_cert rv_cert;
-            hash_t rv_hmac;
-
-            /* RU certificate indicating updated counter value in
-             * IOMT */
-            struct tm_cert ru_cert;
-            hash_t ru_hmac;
-        } modify;
-    };
-};
-
-struct service_provider *sp_new(const void *key, size_t keylen);
+struct service_provider *sp_new(const void *key, size_t keylen, int logleaves);
 struct tm_cert sp_request(struct service_provider *sp,
                           const struct user_request *req, hash_t req_hmac,
                           hash_t *hmac_out,