DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

more checks for configure. omit salt from Rijndael-encrypted data as returned by fko_get_dpa_data.

Browse Source 
git-svn-id: file:///home/mbr/svn/fwknop/trunk@27 510a4753-2344-4c79-9c09-4d669213fbeb
This commit is contained in:
Damien Stuart 2008-12-28 16:22:40 +00:00
parent e6eb3061fb
commit 474a787e0b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -23,9 +23,7 @@ AC_PROG_CPP
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_RANLIB
#--DSS
#AC_PROG_RANLIB
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
# Checks for header files. # Checks for header files.
@ -52,7 +50,8 @@ AC_C_CONST
# Checks for library functions. # Checks for library functions.
# #
AC_FUNC_MALLOC 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 AC_CONFIG_FILES([Makefile
fko/Makefile fko/Makefile

6
fko/fko_funcs.c
View File

@ -224,6 +224,12 @@ fko_get_spa_data(fko_ctx_t *ctx)
if(!CTX_INITIALIZED(ctx)) if(!CTX_INITIALIZED(ctx))
return NULL; 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); return(ctx->encrypted_msg);
} }