From 474a787e0be9f691bb1ae11ff4a01819936e49ed Mon Sep 17 00:00:00 2001 From: Damien Stuart Date: Sun, 28 Dec 2008 16:22:40 +0000 Subject: [PATCH] more checks for configure. omit salt from Rijndael-encrypted data as returned by fko_get_dpa_data. git-svn-id: file:///home/mbr/svn/fwknop/trunk@27 510a4753-2344-4c79-9c09-4d669213fbeb --- configure.ac | 7 +++---- fko/fko_funcs.c | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9c17720b..737b9a40 100644 --- a/configure.ac +++ b/configure.ac @@ -23,9 +23,7 @@ AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET - -#--DSS -#AC_PROG_RANLIB +AC_PROG_RANLIB AC_PROG_LIBTOOL # Checks for header files. @@ -52,7 +50,8 @@ AC_C_CONST # Checks for library functions. # AC_FUNC_MALLOC -AC_CHECK_FUNCS([bzero gettimeofday memmove memset strchr strcspn strdup strrchr strspn]) +AC_FUNC_REALLOC +AC_CHECK_FUNCS([bzero gettimeofday memmove memset strchr strcspn strdup strndup strrchr strspn]) AC_CONFIG_FILES([Makefile fko/Makefile diff --git a/fko/fko_funcs.c b/fko/fko_funcs.c index 8fe1095a..b4807045 100644 --- a/fko/fko_funcs.c +++ b/fko/fko_funcs.c @@ -224,6 +224,12 @@ fko_get_spa_data(fko_ctx_t *ctx) if(!CTX_INITIALIZED(ctx)) return NULL; + /* Notice we omit the first 10 bytes if Rijndael encryption is + * used (to eliminate the consistent 'Salted__' string). + */ + if(ctx->encryption_type == FKO_ENCRYPTION_RIJNDAEL) + return(ctx->encrypted_msg+10); + return(ctx->encrypted_msg); }