Commit 1e5c8d74 authored by Greg Williams's avatar Greg Williams
Browse files

Changing HMAC parameters to take a char string instead of a byte array, for an... 

Changing HMAC parameters to take a char string instead of a byte array, for an easier API to work with and is also consistent with kinetic-cpp-client
parent 72b0fa62

Rakefile

+2 −4
Original line number Diff line number Diff line
@@ -151,15 +151,13 @@ namespace :java_sim do 
  end



  def java_sim_shutdown



    report_banner "Shutting down Kinetic Java Simulator"



    if $java_sim

      report_banner "Shutting down Kinetic Java Simulator"

      Process.kill("INT", $java_sim)

      Process.wait($java_sim)

    end

      $java_sim = nil

    end

  end



  task :start do

    java_sim_start

src/lib/kinetic_api.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ bool KineticApi_ConfigureExchange( 
    KineticExchange* exchange,

    KineticConnection* connection,

    int64_t identity,

    uint8_t* key,

    const char* key,

    size_t keyLength)

{

    if (exchange == NULL)

src/lib/kinetic_api.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ bool KineticApi_ConfigureExchange( 
    KineticExchange* exchange,

    KineticConnection* connection,

    int64_t identity,

    uint8_t* key,

    const char* key,

    size_t keyLength);



/**

src/lib/kinetic_exchange.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
void KineticExchange_Init(

    KineticExchange* const exchange,

    int64_t identity,

    uint8_t* key,

    const char* key,

    size_t keyLength,

    KineticConnection* const connection)

{

src/lib/kinetic_exchange.h

+3 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ typedef struct _KineticExchange 
    // client and the device, used to sign requests.

    bool has_key;

    size_t keyLength;

    uint8_t key[KINETIC_MAX_KEY_LEN];

    char key[KINETIC_MAX_KEY_LEN];



    // Required field

    // A unique number for this connection between the source and target.
@@ -72,6 +72,7 @@ typedef struct _KineticExchange 
    if (k != NULL && klen > 0) \

    { \

        memcpy((exchg)->key, k, klen); \

        (exchg)->key[klen] = '\0'; \

        (exchg)->keyLength = klen; \

        (exchg)->has_key = true; \

    } \
@@ -82,7 +83,7 @@ typedef struct _KineticExchange 
void KineticExchange_Init(

    KineticExchange* const exchange,

    int64_t identity,

    uint8_t* key,

    const char* key,

    size_t keyLength,

    KineticConnection* const connection);