Merge branch 'master' into gpgme_autoconf_macro

mrash · May 13, 2013 · 1144284 · 1144284
2 parents c6b2c0d + 3246c3c
commit 1144284
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/test/conf/hmac_get_key_access.conf b/test/conf/hmac_get_key_access.conf
@@ -0,0 +1,4 @@
+SOURCE: ANY;
+KEY:         rijndaelkey;
+HMAC_KEY:    hmackey;
+FW_ACCESS_TIMEOUT:  3;