Permalink
Browse files

Adapt code to new SAS signature interface of ZRTP library.

  • Loading branch information...
1 parent df2c040 commit 679b6d90d49cdf2a74ae4403a040f4dc48a4ffd3 @wernerd committed Apr 8, 2012
Showing with 8 additions and 8 deletions.
  1. +2 −2 zsrtp/include/transport_zrtp.h
  2. +6 −6 zsrtp/transport_zrtp.c
@@ -362,7 +362,7 @@ typedef struct zrtp_UserCallbacks
* @see ZrtpQueue#setSignatureData
*
*/
- void (*zrtp_signSAS)(void* data, char* sas);
+ void (*zrtp_signSAS)(void* data, uint8_t* sas);
/**
* ZRTP transport calls this method to request a SAS signature check.
@@ -385,7 +385,7 @@ typedef struct zrtp_UserCallbacks
* true if the signature was ok, false otherwise.
*
*/
- int32_t (*zrtp_checkSASSignature)(void* data, char* sas);
+ int32_t (*zrtp_checkSASSignature)(void* data, uint8_t* sas);
void* userData; /*!< Point to some user data, for example to store some context */
} zrtp_UserCallbacks;
View
@@ -158,8 +158,8 @@ static void zrtp_synchEnter(ZrtpContext* ctx) ;
static void zrtp_synchLeave(ZrtpContext* ctx) ;
static void zrtp_zrtpAskEnrollment(ZrtpContext* ctx, int32_t info) ;
static void zrtp_zrtpInformEnrollment(ZrtpContext* ctx, int32_t info) ;
-static void zrtp_signSAS(ZrtpContext* ctx, char* sas) ;
-static int32_t zrtp_checkSASSignature(ZrtpContext* ctx, char* sas) ;
+static void zrtp_signSAS(ZrtpContext* ctx, uint8_t* sasHash) ;
+static int32_t zrtp_checkSASSignature(ZrtpContext* ctx, uint8_t* sasHash) ;
/* The callback function structure for ZRTP */
static zrtp_Callbacks c_callbacks =
@@ -791,23 +791,23 @@ static void zrtp_zrtpInformEnrollment(ZrtpContext* ctx, int32_t info)
}
}
-static void zrtp_signSAS(ZrtpContext* ctx, char* sas)
+static void zrtp_signSAS(ZrtpContext* ctx, uint8_t* sasHash)
{
struct tp_zrtp *zrtp = (struct tp_zrtp*)ctx->userData;
if (zrtp->userCallback != NULL)
{
- zrtp->userCallback->zrtp_signSAS(zrtp->userCallback->userData, sas);
+ zrtp->userCallback->zrtp_signSAS(zrtp->userCallback->userData, sasHash);
}
}
-static int32_t zrtp_checkSASSignature(ZrtpContext* ctx, char* sas)
+static int32_t zrtp_checkSASSignature(ZrtpContext* ctx, uint8_t* sasHash)
{
struct tp_zrtp *zrtp = (struct tp_zrtp*)ctx->userData;
if (zrtp->userCallback != NULL)
{
- return zrtp->userCallback->zrtp_checkSASSignature(zrtp->userCallback->userData, sas);
+ return zrtp->userCallback->zrtp_checkSASSignature(zrtp->userCallback->userData, sasHash);
}
return 0;
}

0 comments on commit 679b6d9

Please sign in to comment.