summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2015-12-06 10:57:48 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2015-12-06 10:57:48 +0100
commit7ce2024894aa11573dd73a405936a65cd348e513 (patch)
tree6e8e2964abce0a50e2193295e2c82f3ea19906ec
parent266d0ad59c7303bff5f49f4a9bec8d320fe96ac9 (diff)
downloadgnutls-7ce2024894aa11573dd73a405936a65cd348e513.tar.gz
MAX_PK_PARAM_SIZE was moved to gnutls_int.h
-rw-r--r--lib/gnutls_int.h4
-rw-r--r--lib/pkcs11.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index e9a1db54ff..e51aedd288 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -192,10 +192,12 @@ typedef enum record_flush_t {
processes before aborting. */
#define MAX_HANDSHAKE_HELLO_VERIFY_REQUESTS 5
+#define MAX_PK_PARAM_SIZE 2048
+
/* defaults for verification functions
*/
#define DEFAULT_MAX_VERIFY_DEPTH 16
-#define DEFAULT_MAX_VERIFY_BITS 16*1024
+#define DEFAULT_MAX_VERIFY_BITS (MAX_PK_PARAM_SIZE*8)
#define MAX_VERIFY_DEPTH 4096
#include <mem.h>
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 753175ebf8..dd22e4caef 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -1512,8 +1512,6 @@ pkcs11_obj_import(ck_object_class_t class, gnutls_pkcs11_obj_t obj,
return 0;
}
-#define MAX_PK_PARAM_SIZE 2048
-
int pkcs11_read_pubkey(struct ck_function_list *module,
ck_session_handle_t pks, ck_object_handle_t obj,
ck_key_type_t key_type, gnutls_pkcs11_obj_t pobj)