Commit 7aa772cf authored by Greg Williams's avatar Greg Williams
Browse files

Merge branch 'develop'

parents 84f5d0cc a50c2c74

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ bin/ 
obj/

build/

docs/api/

tmp/



# Eclipse temp files

.metadata/

Makefile

+6 −5
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ LIB_OBJS = \ 
	$(OUT_DIR)/kinetic_semaphore.o \

	$(OUT_DIR)/kinetic_countingsemaphore.o \

	$(OUT_DIR)/kinetic_resourcewaiter.o \

	$(OUT_DIR)/acl.o \

	$(OUT_DIR)/byte_array.o \

	$(OUT_DIR)/kinetic_client.o \

	$(OUT_DIR)/kinetic_admin_client.o \
@@ -86,8 +87,6 @@ LIB_OBJS = \ 
	$(OUT_DIR)/util.o \

	$(OUT_DIR)/yacht.o \







KINETIC_LIB_OTHER_DEPS = Makefile Rakefile $(VERSION_FILE)
@@ -169,6 +168,8 @@ ci: stop_sims start_sims all stop_sims 


json: ${OUT_DIR}/libjson-c.a



$(OUT_DIR)/acl.o: json



json_install: json

	cd ${JSONC} && \

	make install
@@ -236,7 +237,7 @@ ${OUT_DIR}/libthreadpool.a: ${LIB_DIR}/threadpool/*.[ch] 
KINETIC_SO_DEV = $(BIN_DIR)/lib$(KINETIC_LIB_NAME).so

KINETIC_SO_RELEASE = $(PREFIX)/lib$(KINETIC_LIB_NAME).so



$(KINETIC_LIB): $(LIB_OBJS) $(KINETIC_LIB_OTHER_DEPS)

$(KINETIC_LIB): $(LIB_OBJS) $(KINETIC_LIB_OTHER_DEPS) json

	@echo

	@echo --------------------------------------------------------------------------------

	@echo Building static library: $(KINETIC_LIB)
@@ -328,7 +329,7 @@ UNITY_SRC = ./vendor/unity/src/unity.c 


SYSTEST_SRC = ./test/system

SYSTEST_OUT = $(BIN_DIR)/systest

SYSTEST_LDFLAGS += -lm $(KINETIC_LIB) -L${OPENSSL_PATH}/lib -lssl -lcrypto -lpthread

SYSTEST_LDFLAGS += -lm $(KINETIC_LIB) -L${OUT_DIR} -L${OPENSSL_PATH}/lib -lssl -lcrypto -lpthread -ljson-c

SYSTEST_WARN = -Wall -Wextra -Werror -Wstrict-prototypes -pedantic -Wno-missing-field-initializers -Werror=strict-prototypes

SYSTEST_CFLAGS += -std=c99 -fPIC -g $(SYSTEST_WARN) $(CDEFS) $(OPTIMIZE) -DTEST
@@ -369,7 +370,7 @@ UTILITY = kinetic-c-util 
UTIL_DIR = ./src/utility

UTIL_EXEC = $(BIN_DIR)/$(UTILITY)

UTIL_OBJ = $(OUT_DIR)/main.o

UTIL_LDFLAGS += -lm $(KINETIC_LIB) -L${OPENSSL_PATH}/lib -lssl -lcrypto -lpthread

UTIL_LDFLAGS += -lm $(KINETIC_LIB) -L${OUT_DIR} -L${OPENSSL_PATH}/lib -lssl -lcrypto -lpthread -ljson-c



$(UTIL_OBJ): $(UTIL_DIR)/main.c

	$(CC) -c -o $@ $< $(CFLAGS) -I$(PUB_INC) -I$(UTIL_DIR)

RELEASE.md

+3 −1
Original line number Diff line number Diff line
@@ -5,10 +5,12 @@ v0.12.0 (kinetic-protocol 3.0.5) 
        * KineticClient_InstantSecureErase => KineticAdminClient_InstantErase/KineticAdminClient_SecureErase

        * KineticClient_GetLog => KineticAdminClient_GetLog

        * KineticClient_FreeDeviceInfo -> KineticAdminClient_LogInfo

* Added `KINETIC_STATUS_NOT_AUTHORIZED` to KineticStatus enum.

* Added KineticAdminClient_SetACL command.

* KineticSession is now supplied as an opaque instance pointer from KineticClient_CreateSession

    * Passed KineticClientConfig copied and can be discarded after session creation

* *KNOWN ISSUES*

    * KineticAdminClient_UpdateFirmware and KineticAdminClient_SetAcl are incomplete

    * KineticAdminClient_UpdateFirmware is incomplete



v0.11.2 (kinetic-protocol 3.0.5)

--------------------------------

config/project.yml

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
    - include/**

    - vendor/socket99/**

    - vendor/protobuf-c/**

    - vendor/json-c/**



:defines:

  :commmon: &common_defines
@@ -133,6 +134,8 @@ 
      - -l crypto

      - "-o \"${2}\""

      - -l pthread

      - -L obj/

      - -l json-c



:plugins:

  :load_paths:

include/kinetic_admin_client.h

+13 −12
Original line number Diff line number Diff line
@@ -183,18 +183,6 @@ KineticStatus KineticAdminClient_GetLog(KineticSession const * const session, 
void KineticAdminClient_FreeLogInfo(KineticSession const * const session,

                                  KineticLogInfo* info);



/**

 * @brief Executes a SECURITY command to define/set the access control list

 * (ACL) for the Kinetic device.

 *

 * @param session   The connected KineticSession to use for the operation.

 * @param acl_path  Path to ACL definitions per identity in JSON format.

 *

 * @return          Returns the resulting KineticStatus.

 */

KineticStatus KineticAdminClient_SetAcl(KineticSession const * const session,

    char const * const acl_path);



/**

 * @brief Updates the cluster version of the Kinetic Device.

 *
@@ -217,4 +205,17 @@ KineticStatus KineticAdminClient_SetClusterVersion(KineticSession const * const 
KineticStatus KineticAdminClient_UpdateFirmware(KineticSession const * const session,

    char const * const fw_path);





/**

 * @brief Executes a SECURITY operation, setting one or more ACLs.

 *

 * @param session       The connected KineticSession to use for the operation

 * @param ACLPath       Path to a JSON file containing one or more ACLs.

 *

 * @return              Returns 0 upon success, -1 or the Kinetic status code

 *                      upon failure.

 */

KineticStatus KineticAdminClient_SetACL(KineticSession const * const session,

                                        const char *ACLPath);



#endif // _KINETIC_ADMIN_CLIENT_H