merged usage() information from master

diff --cc lib/fko.h
index e694a71,1f5af83..9ef8ae4
--- 1/lib/fko.h
--- 2/lib/fko.h
+++ b/lib/fko.h
@@@ -224,8 -206,9 +224,10 @@@ DLL_API int fko_set_spa_server_auth(fko
  DLL_API int fko_set_spa_client_timeout(fko_ctx_t ctx, const int timeout);
  DLL_API int fko_set_spa_digest_type(fko_ctx_t ctx, const short digest_type);
  DLL_API int fko_set_spa_digest(fko_ctx_t ctx);
+ DLL_API int fko_set_raw_spa_digest_type(fko_ctx_t ctx, const short raw_digest_type);
+ DLL_API int fko_set_raw_spa_digest(fko_ctx_t ctx);
  DLL_API int fko_set_spa_encryption_type(fko_ctx_t ctx, const short encrypt_type);
 +DLL_API int fko_set_spa_encryption_mode(fko_ctx_t ctx, const int encrypt_mode);
  DLL_API int fko_set_spa_data(fko_ctx_t ctx, const char *enc_msg);
  
  /* Data processing and misc utility functions
@@@ -252,9 -235,10 +254,11 @@@ DLL_API int fko_get_spa_nat_access(fko_
  DLL_API int fko_get_spa_server_auth(fko_ctx_t ctx, char **server_auth);
  DLL_API int fko_get_spa_client_timeout(fko_ctx_t ctx, int *client_timeout);
  DLL_API int fko_get_spa_digest_type(fko_ctx_t ctx, short *spa_digest_type);
+ DLL_API int fko_get_raw_spa_digest_type(fko_ctx_t ctx, short *raw_spa_digest_type);
  DLL_API int fko_get_spa_digest(fko_ctx_t ctx, char **spa_digest);
+ DLL_API int fko_get_raw_spa_digest(fko_ctx_t ctx, char **raw_spa_digest);
  DLL_API int fko_get_spa_encryption_type(fko_ctx_t ctx, short *spa_enc_type);
 +DLL_API int fko_get_spa_encryption_mode(fko_ctx_t ctx, int *spa_enc_mode);
  DLL_API int fko_get_spa_data(fko_ctx_t ctx, char **spa_data);
  
  DLL_API int fko_get_version(fko_ctx_t ctx, char **version);

diff --cc lib/fko_context.h
Simple merge

diff --cc lib/fko_funcs.c
Simple merge

diff --cc server/incoming_spa.c
Simple merge

diff --cc test/test-fwknop.pl
index b919582,30d1af8..7ffd3a8
--- 1/test/test-fwknop.pl
--- 2/test/test-fwknop.pl
+++ b/test/test-fwknop.pl
@@@ -31,8 -26,8 +31,9 @@@ my $expired_access_conf = "$conf_dir/ex
  my $future_expired_access_conf = "$conf_dir/future_expired_stanza_access.conf";
  my $expired_epoch_access_conf = "$conf_dir/expired_epoch_stanza_access.conf";
  my $invalid_expire_access_conf = "$conf_dir/invalid_expire_access.conf";
 +my $invalid_source_access_conf = "$conf_dir/invalid_source_access.conf";
  my $force_nat_access_conf = "$conf_dir/force_nat_access.conf";
+ my $dual_key_usage_access_conf = "$conf_dir/dual_key_usage_access.conf";
  my $gpg_access_conf     = "$conf_dir/gpg_access.conf";
  my $default_digest_file = "$run_dir/digest.cache";
  my $default_pid_file    = "$run_dir/fwknopd.pid";
@@@ -1326,16 -1254,20 +1352,28 @@@ my @tests = 
          'function' => \&digest_cache_structure,
          'fatal'    => $NO
      },
 +
 +    {
 +        'category' => 'profile coverage',
 +        'detail'   => 'gcov profile coverage',
 +        'err_msg'  => 'profile coverage failed',
 +        'function' => \&profile_coverage,
 +        'fatal'    => $NO
 +    },
  );
  
+ if ($use_valgrind) {
+     push @tests,
+         {
+             'category' => 'valgrind output',
+             'subcategory' => 'flagged functions',
+             'detail'   => '',
+             'err_msg'  => 'could not parse flagged functions',
+             'function' => \&parse_valgrind_flagged_functions,
+             'fatal'    => $NO
+         };
+ }
+ 
  my %test_keys = (
      'category'        => $REQUIRED,
      'subcategory'     => $OPTIONAL,