Commit d5fff531 authored by Greg Williams's avatar Greg Williams
Browse files

Created kinetic_admin_client and relocated GetLog and InstantSecureErase into... 

Created kinetic_admin_client and relocated GetLog and InstantSecureErase into it. Added kinetic_auth module which is working for HMAC, but PIN auth is still in progress, since needs SSL support as well.
parent 515d0124

Gemfile

+1 −1
Original line number Diff line number Diff line 
source "http://rubygems.org/"

gem 'bundler', '>= 1.3.5'

gem 'ceedling', '>= 0.15'

gem 'ceedling', '>= 0.16'

gem 'kinetic-ruby'

Gemfile.lock

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ GEM 
  remote: http://rubygems.org/

  specs:

    beefcake (0.5.0)

    ceedling (0.15.6)

    ceedling (0.16.0)

      rake (>= 0.8.7)

      thor (>= 0.14.5)

    diff-lcs (1.2.5)
@@ -30,5 +30,5 @@ PLATFORMS 


DEPENDENCIES

  bundler (>= 1.3.5)

  ceedling (>= 0.15)

  ceedling (>= 0.16)

  kinetic-ruby

Makefile

+7 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ PUB_INC = ./include 
#===============================================================================

CC ?= gcc

OPTIMIZE = -O3

SYSTEM_TEST_HOST ?= \"localhost\"

SYSTEM_TEST_HOST ?= localhost

CLUSTER_VERSION ?= 0

WARN = -Wall -Wextra -Wstrict-prototypes -Wcast-align -pedantic -Wno-missing-field-initializers -Werror=strict-prototypes

CDEFS += -D_POSIX_C_SOURCE=199309L -D_C99_SOURCE=1 -DSYSTEM_TEST_HOST=\"${SYSTEM_TEST_HOST}\" -DCLUSTER_VERSION=${CLUSTER_VERSION}
@@ -45,6 +45,7 @@ LIB_OBJS = \ 
	$(OUT_DIR)/kinetic_nbo.o \

	$(OUT_DIR)/kinetic_operation.o \

	$(OUT_DIR)/kinetic_pdu.o \

	$(OUT_DIR)/kinetic_auth.o \

	$(OUT_DIR)/kinetic_proto.o \

	$(OUT_DIR)/kinetic_socket.o \

	$(OUT_DIR)/kinetic_message.o \
@@ -57,7 +58,8 @@ LIB_OBJS = \ 
	$(OUT_DIR)/kinetic_types_internal.o \

	$(OUT_DIR)/kinetic_types.o \

	$(OUT_DIR)/byte_array.o \

	$(OUT_DIR)/kinetic_client.o

	$(OUT_DIR)/kinetic_client.o \

	$(OUT_DIR)/kinetic_admin_client.o



KINETIC_LIB_OTHER_DEPS = Makefile Rakefile $(VERSION_FILE)
@@ -275,6 +277,9 @@ $(SYSTEST_OUT)/%.testpass : $(SYSTEST_OUT)/run_% 
$(systest_names) : % : $(SYSTEST_OUT)/%.testpass

system_tests: start_simulator $(systest_passfiles)



.SECONDARY: $(systest_executables) $(systest_sources)





# valgrind_systest_%: $(SYSTEST_OUT)/%

# 	@echo

# 	@echo ================================================================================

include/kinetic_admin_client.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#define _KINETIC_ADMIN_CLIENT_H



#include "kinetic_types.h"

#include "kinetic_client.h"



/**

 * Initializes the Kinetic API and configures logging destination.

include/kinetic_types.h

+3 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#define KINETIC_TLS_PORT        (8443)

#define KINETIC_HMAC_SHA1_LEN   (SHA_DIGEST_LENGTH)

#define KINETIC_HMAC_MAX_LEN    (KINETIC_HMAC_SHA1_LEN)

#define KINETIC_MAX_PIN_LEN     (1024)

#define KINETIC_PIN_MAX_LEN     (1024)

#define KINETIC_DEFAULT_KEY_LEN (1024)

#define KINETIC_MAX_KEY_LEN     (4096)

#define KINETIC_MAX_VERSION_LEN (256)
@@ -123,7 +123,7 @@ typedef struct _KineticSessionConfig { 


    // This is the PIN to use for the session. If a PIN is set, then PIN-based

    // authentication is assumend for the session (rather than HMAC)

    uint8_t pinData[KINETIC_MAX_PIN_LEN];

    uint8_t pinData[KINETIC_PIN_MAX_LEN];

    ByteArray pin;

} KineticSessionConfig;
@@ -179,6 +179,7 @@ typedef enum { 
    KINETIC_STATUS_MISSING_VALUE_BUFFER,// An operation is missing a required value buffer

    KINETIC_STATUS_PIN_REQUIRED,        // The operation requires a PIN and one was not specified

    KINETIC_STATUS_SSL_REQUIRED,        // The operation requires an SSL connection and the specified connection is non-SSL

    KINTEIC_STATUS_AUTH_INFO_MISSING,   // The specified session contains no authentication info

    KINETIC_STATUS_COUNT                // Number of status codes in KineticStatusDescriptor

} KineticStatus;