diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2017-11-13 11:03:35 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-11-14 16:45:13 +0100 |
| commit | 1d2054ee52af21dda38cb506421615327812df90 (patch) | |
| tree | 8045db8424d1986b1634ed260c6066e9f217f73c | |
| parent | 47734ee1bebf1dc81f2cc389a6c4e2a060d12eca (diff) | |
| download | gnutls-tmp-fix-static-linking-issue.tar.gz | |
p11tool: renamed pkcs11_set_pin() to allow static linkingtmp-fix-static-linking-issue
Resolves #322
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
| -rw-r--r-- | src/p11tool.c | 4 | ||||
| -rw-r--r-- | src/p11tool.h | 2 | ||||
| -rw-r--r-- | src/pkcs11.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/p11tool.c b/src/p11tool.c index 2e9c80074c..1042af2ad2 100644 --- a/src/p11tool.c +++ b/src/p11tool.c @@ -328,9 +328,9 @@ static void cmd_parser(int argc, char **argv) } else if (HAVE_OPT(INITIALIZE)) { pkcs11_init(outfile, url, label, &cinfo); } else if (HAVE_OPT(INITIALIZE_PIN)) { - pkcs11_set_pin(outfile, url, &cinfo, 0); + pkcs11_set_token_pin(outfile, url, &cinfo, 0); } else if (HAVE_OPT(INITIALIZE_SO_PIN)) { - pkcs11_set_pin(outfile, url, &cinfo, 1); + pkcs11_set_token_pin(outfile, url, &cinfo, 1); } else if (HAVE_OPT(DELETE)) { pkcs11_delete(outfile, url, flags, &cinfo); } else if (HAVE_OPT(GENERATE_PRIVKEY)) { diff --git a/src/p11tool.h b/src/p11tool.h index dda598bb78..6ac11895af 100644 --- a/src/p11tool.h +++ b/src/p11tool.h @@ -49,7 +49,7 @@ void pkcs11_delete(FILE * outfile, const char *pkcs11_url, unsigned int flags, common_info_st *); void pkcs11_init(FILE * outfile, const char *pkcs11_url, const char *label, common_info_st *); -void pkcs11_set_pin(FILE * outfile, const char *pkcs11_url, common_info_st *, unsigned so); +void pkcs11_set_token_pin(FILE * outfile, const char *pkcs11_url, common_info_st *, unsigned so); void pkcs11_generate(FILE * outfile, const char *url, gnutls_pk_algorithm_t type, unsigned int bits, const char *label, const char *id, int detailed, diff --git a/src/pkcs11.c b/src/pkcs11.c index 4017bcb0eb..93b9da4a1e 100644 --- a/src/pkcs11.c +++ b/src/pkcs11.c @@ -1423,7 +1423,7 @@ pkcs11_init(FILE * outfile, const char *url, const char *label, } void -pkcs11_set_pin(FILE * outfile, const char *url, common_info_st * info, unsigned so) +pkcs11_set_token_pin(FILE * outfile, const char *url, common_info_st * info, unsigned so) { int ret; const char *pin; |