|
|
|
|
Index: doc/doxygen/Doxyfile
|
|
|
|
|
Index: src/p11tool.c
|
|
|
|
|
--- src/p11tool.c.orig 2015-04-04 09:35:44.000000000 +0200
|
|
|
|
|
+++ src/p11tool.c 2015-05-15 17:25:03.405152890 +0200
|
|
|
|
|
@@ -244,7 +244,7 @@
|
|
|
|
|
} else if (HAVE_OPT(LIST_MECHANISMS)) {
|
|
|
|
|
pkcs11_mechanism_list(outfile, url, flags, &cinfo);
|
|
|
|
|
} else if (HAVE_OPT(GENERATE_RANDOM)) {
|
|
|
|
|
- pkcs11_get_random(outfile, url, OPT_VALUE_GENERATE_RANDOM,
|
|
|
|
|
+ xxx_pkcs11_get_random(outfile, url, OPT_VALUE_GENERATE_RANDOM,
|
|
|
|
|
&cinfo);
|
|
|
|
|
} else if (HAVE_OPT(INFO)) {
|
|
|
|
|
pkcs11_type = PKCS11_TYPE_INFO;
|
|
|
|
|
Index: src/p11tool.h
|
|
|
|
|
--- src/p11tool.h.orig 2015-04-01 20:09:54.000000000 +0200
|
|
|
|
|
+++ src/p11tool.h 2015-05-15 17:25:03.405152890 +0200
|
|
|
|
|
@@ -30,7 +30,7 @@
|
|
|
|
|
common_info_st *);
|
|
|
|
|
void pkcs11_mechanism_list(FILE * outfile, const char *url,
|
|
|
|
|
unsigned int flags, common_info_st *);
|
|
|
|
|
-void pkcs11_get_random(FILE * outfile, const char *url,
|
|
|
|
|
+void xxx_pkcs11_get_random(FILE * outfile, const char *url,
|
|
|
|
|
unsigned bytes, common_info_st *);
|
|
|
|
|
void pkcs11_export(FILE * outfile, const char *pkcs11_url,
|
|
|
|
|
unsigned int flags, common_info_st *);
|
|
|
|
|
Index: src/pkcs11.c
|
|
|
|
|
--- src/pkcs11.c.orig 2015-04-04 09:36:11.000000000 +0200
|
|
|
|
|
+++ src/pkcs11.c 2015-05-15 17:25:03.405152890 +0200
|
|
|
|
|
@@ -1117,7 +1117,7 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
-pkcs11_get_random(FILE * outfile, const char *url, unsigned bytes,
|
|
|
|
|
+xxx_pkcs11_get_random(FILE * outfile, const char *url, unsigned bytes,
|
|
|
|
|
common_info_st * info)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
