aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorSimon L. B. Nielsen <simon@FreeBSD.org>2010-04-01 12:25:40 +0000
committerSimon L. B. Nielsen <simon@FreeBSD.org>2010-04-01 12:25:40 +0000
commit0cedaa6c89235ed396068f2ebf546c9a909439e1 (patch)
treeea91d9b180fa36b1886b046a286630c089f57475 /engines
parentf7a1b4761cf3f798e1b42d703d38221b47ce1eec (diff)
downloadsrc-0cedaa6c89235ed396068f2ebf546c9a909439e1.tar.gz
src-0cedaa6c89235ed396068f2ebf546c9a909439e1.zip
Import OpenSSL 0.9.8n.vendor/openssl/0.9.8n
Notes
Notes: svn path=/vendor-crypto/openssl/dist/; revision=206035 svn path=/vendor-crypto/openssl/0.9.8n/; revision=206037; tag=vendor/openssl/0.9.8n
Diffstat (limited to 'engines')
-rw-r--r--engines/e_capi.c4
-rw-r--r--engines/e_chil.c11
2 files changed, 13 insertions, 2 deletions
diff --git a/engines/e_capi.c b/engines/e_capi.c
index fd7f13ca2cfc..59b2ab7b5896 100644
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -83,6 +83,10 @@
#define CERT_STORE_CREATE_NEW_FLAG 0x00002000
#endif
+#ifndef CERT_SYSTEM_STORE_CURRENT_USER
+#define CERT_SYSTEM_STORE_CURRENT_USER 0x00010000
+#endif
+
#include <openssl/engine.h>
#include <openssl/pem.h>
#include <openssl/x509v3.h>
diff --git a/engines/e_chil.c b/engines/e_chil.c
index e1847622ea74..3a07076b4fef 100644
--- a/engines/e_chil.c
+++ b/engines/e_chil.c
@@ -1204,6 +1204,11 @@ static int hwcrhk_get_pass(const char *prompt_info,
pem_password_cb *callback = NULL;
void *callback_data = NULL;
UI_METHOD *ui_method = NULL;
+ /* Despite what the documentation says prompt_info can be
+ * an empty string.
+ */
+ if (prompt_info && !*prompt_info)
+ prompt_info = NULL;
if (cactx)
{
@@ -1305,8 +1310,10 @@ static int hwcrhk_insert_card(const char *prompt_info,
{
char answer;
char buf[BUFSIZ];
-
- if (wrong_info)
+ /* Despite what the documentation says wrong_info can be
+ * an empty string.
+ */
+ if (wrong_info && *wrong_info)
BIO_snprintf(buf, sizeof(buf)-1,
"Current card: \"%s\"\n", wrong_info);
ok = UI_dup_info_string(ui, buf);