[pkg-opensc-commit] [pkcs11-helper] 48/253: Move mistake correction#1
Eric Dorland
eric at moszumanska.debian.org
Fri Jan 6 23:39:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository pkcs11-helper.
commit 3f2dcaea6eb5e0c79300a21b804b600cb5606b7f
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date: Wed Dec 20 20:09:03 2006 +0000
Move mistake correction#1
---
tests/test-basic/test-basic.c | 69 -------
tests/test-certificate/test-certificate.c | 322 ------------------------------
tests/test-slotevent/test-slotevent.c | 141 -------------
3 files changed, 532 deletions(-)
diff --git a/tests/test-basic/test-basic.c b/tests/test-basic/test-basic.c
deleted file mode 100644
index 4af909b..0000000
--- a/tests/test-basic/test-basic.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "../../config.h"
-#include <pkcs11-helper-1.0/pkcs11h-core.h>
-
-static
-void
-fatal (const char * const m, CK_RV rv) {
- fprintf (stderr, "%s - %08lu - %s\n", m, rv, pkcs11h_getMessage (rv));
- exit (1);
-}
-
-static
-void
-_pkcs11h_hooks_log (
- IN void * const global_data,
- IN unsigned flags,
- IN const char * const format,
- IN va_list args
-) {
- vfprintf (stdout, format, args);
- fprintf (stdout, "\n");
-}
-
-int main () {
- CK_RV rv;
-
- printf ("Version: %08x\n", pkcs11h_getVersion ());
- printf ("Features: %08x\n", pkcs11h_getFeatures ());
-
- printf ("Initializing pkcs11-helper\n");
-
- if ((rv = pkcs11h_initialize ()) != CKR_OK) {
- fatal ("pkcs11h_initialize failed", rv);
- }
-
- printf ("Registering pkcs11-helper hooks\n");
-
- if ((rv = pkcs11h_setLogHook (_pkcs11h_hooks_log, NULL)) != CKR_OK) {
- fatal ("pkcs11h_setLogHook failed", rv);
- }
-
- pkcs11h_setLogLevel (TEST_LOG_LEVEL);
-
- printf ("Adding provider '%s'\n", TEST_PROVIDER);
-
- if (
- (rv = pkcs11h_addProvider (
- TEST_PROVIDER,
- TEST_PROVIDER,
- FALSE,
- PKCS11H_PRIVATEMODE_MASK_AUTO,
- PKCS11H_SLOTEVENT_METHOD_AUTO,
- 0,
- FALSE
- )) != CKR_OK
- ) {
- fatal ("pkcs11h_terminate failed", rv);
- }
-
- printf ("Terminating pkcs11-helper\n");
-
- if ((rv = pkcs11h_terminate ()) != CKR_OK) {
- fatal ("pkcs11h_terminate failed", rv);
- }
-
- exit (0);
- return 0;
-}
diff --git a/tests/test-certificate/test-certificate.c b/tests/test-certificate/test-certificate.c
deleted file mode 100644
index bf42c05..0000000
--- a/tests/test-certificate/test-certificate.c
+++ /dev/null
@@ -1,322 +0,0 @@
-#include "../../config.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if !(!defined(_WIN32) && defined(ENABLE_PKCS11H_CERTIFICATE) && (defined(ENABLE_PKCS11H_ENGINE_OPENSSL) || defined (ENABLE_PKCS11H_ENGINE_GNUTLS) || defined(ENABLE_PKCS11H_ENGINE_WIN32)))
-int main () {
- printf ("!win32, certificate, enum and crypto engine interfaces should be enabled for this test");
- exit (0);
- return 0;
-}
-#else
-
-#include <pkcs11-helper-1.0/pkcs11h-certificate.h>
-#include <unistd.h>
-
-static
-void
-fatal (const char * const m, CK_RV rv) {
- fprintf (stderr, "%s - %lu - %s\n", m, rv, pkcs11h_getMessage (rv));
- exit (1);
-}
-
-static
-void
-mypause (const char * const m) {
- char temp[10];
-
- fprintf (stdout, "%s", m);
- fgets (temp, sizeof (temp), stdin);
-}
-
-static
-void
-_pkcs11h_hooks_log (
- IN void * const global_data,
- IN unsigned flags,
- IN const char * const format,
- IN va_list args
-) {
- vfprintf (stdout, format, args);
- fprintf (stdout, "\n");
-}
-
-static
-PKCS11H_BOOL
-_pkcs11h_hooks_token_prompt (
- IN void * const global_data,
- IN void * const user_data,
- IN const pkcs11h_token_id_t token,
- IN const unsigned retry
-) {
- char buf[1024];
- PKCS11H_BOOL fValidInput = FALSE;
- PKCS11H_BOOL fRet = FALSE;
-
- while (!fValidInput) {
- fprintf (stderr, "Please insert token '%s' 'ok' or 'cancel': ", token->display);
- fgets (buf, sizeof (buf), stdin);
- buf[sizeof (buf)-1] = '\0';
- fflush (stdin);
-
- if (buf[strlen (buf)-1] == '\n') {
- buf[strlen (buf)-1] = '\0';
- }
- if (buf[strlen (buf)-1] == '\r') {
- buf[strlen (buf)-1] = '\0';
- }
-
- if (!strcmp (buf, "ok")) {
- fValidInput = TRUE;
- fRet = TRUE;
- }
- else if (!strcmp (buf, "cancel")) {
- fValidInput = TRUE;
- }
- }
-
- return fRet;
-}
-
-static
-PKCS11H_BOOL
-_pkcs11h_hooks_pin_prompt (
- IN void * const global_data,
- IN void * const user_data,
- IN const pkcs11h_token_id_t token,
- IN const unsigned retry,
- OUT char * const pin,
- IN const size_t pin_max
-) {
- char prompt[1024];
- char *p = NULL;
-
- snprintf (prompt, sizeof (prompt), "Please enter '%s' PIN or 'cancel': ", token->display);
-
-#if defined(_WIN32)
- {
- size_t i = 0;
- char c;
- while (i < pin_max && (c = getch ()) != '\r') {
- pin[i++] = c;
- }
- }
-
- fprintf (stderr, "\n");
-#else
- p = getpass (prompt);
-#endif
-
- strncpy (pin, p, pin_max);
- pin[pin_max-1] = '\0';
-
- return strcmp (pin, "cancel") != 0;
-}
-
-void
-sign_test (const pkcs11h_certificate_t cert) {
-
- static unsigned const char sha1_data[] = {
- 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, /* 1.3.14.3.2.26 */
- 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* dummy data */
- 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
- 0x10, 0x11, 0x12, 0x13, 0x14
- };
-
- CK_RV rv;
-
- unsigned char *blob;
- size_t blob_size;
-
- if (
- (rv = pkcs11h_certificate_signAny (
- cert,
- CKM_RSA_PKCS,
- sha1_data,
- sizeof (sha1_data),
- NULL,
- &blob_size
- )) != CKR_OK
- ) {
- fatal ("pkcs11h_certificate_sign(1) failed", rv);
- }
-
- blob = (unsigned char *)malloc (blob_size);
-
- if (
- (rv = pkcs11h_certificate_signAny (
- cert,
- CKM_RSA_PKCS,
- sha1_data,
- sizeof (sha1_data),
- blob,
- &blob_size
- )) != CKR_OK
- ) {
- fatal ("pkcs11h_certificate_sign(1) failed", rv);
- }
-
- free (blob);
-}
-
-int main () {
- pkcs11h_certificate_id_list_t issuers, certs, temp;
- pkcs11h_certificate_t cert;
- CK_RV rv;
-
- printf ("Initializing pkcs11-helper\n");
-
- if ((rv = pkcs11h_initialize ()) != CKR_OK) {
- fatal ("pkcs11h_initialize failed", rv);
- }
-
- printf ("Registering pkcs11-helper hooks\n");
-
- if ((rv = pkcs11h_setLogHook (_pkcs11h_hooks_log, NULL)) != CKR_OK) {
- fatal ("pkcs11h_setLogHook failed", rv);
- }
-
- pkcs11h_setLogLevel (TEST_LOG_LEVEL);
-
- if ((rv = pkcs11h_setTokenPromptHook (_pkcs11h_hooks_token_prompt, NULL)) != CKR_OK) {
- fatal ("pkcs11h_setTokenPromptHook failed", rv);
- }
-
- if ((rv = pkcs11h_setPINPromptHook (_pkcs11h_hooks_pin_prompt, NULL)) != CKR_OK) {
- fatal ("pkcs11h_setPINPromptHook failed", rv);
- }
-
- printf ("Adding provider '%s'\n", TEST_PROVIDER);
-
- if (
- (rv = pkcs11h_addProvider (
- TEST_PROVIDER,
- TEST_PROVIDER,
- FALSE,
- PKCS11H_PRIVATEMODE_MASK_AUTO,
- PKCS11H_SLOTEVENT_METHOD_AUTO,
- 0,
- FALSE
- )) != CKR_OK
- ) {
- fatal ("pkcs11h_terminate failed", rv);
- }
-
- mypause ("Please remove all tokens, press <Enter>: ");
-
- printf ("Enumerating token certificate (list should be empty, no prompt)\n");
-
- if (
- (rv = pkcs11h_certificate_enumCertificateIds (
- PKCS11H_ENUM_METHOD_CACHE,
- NULL,
- PKCS11H_PROMPT_MASK_ALLOW_ALL,
- &issuers,
- &certs
- )) != CKR_OK
- ) {
- fatal ("pkcs11h_certificate_enumCertificateIds failed", rv);
- }
-
- if (issuers != NULL || certs != NULL) {
- fatal ("No certificates should be found", rv);
- }
-
- mypause ("Please insert token, press <Enter>: ");
-
- printf ("Getting certificate cache, should be available certificates\n");
-
- if (
- (rv = pkcs11h_certificate_enumCertificateIds (
- PKCS11H_ENUM_METHOD_CACHE,
- NULL,
- PKCS11H_PROMPT_MASK_ALLOW_ALL,
- &issuers,
- &certs
- )) != CKR_OK
- ) {
- fatal ("pkcs11h_certificate_enumCertificateIds failed", rv);
- }
-
- for (temp = issuers;temp != NULL;temp = temp->next) {
- printf ("Issuer: %s\n", temp->certificate_id->displayName);
- }
- for (temp = certs;temp != NULL;temp = temp->next) {
- printf ("Certificate: %s\n", temp->certificate_id->displayName);
- }
-
- if (certs == NULL) {
- fatal ("No certificates found", rv);
- }
-
- pkcs11h_certificate_freeCertificateIdList (issuers);
- pkcs11h_certificate_freeCertificateIdList (certs);
-
- mypause ("Please remove token, press <Enter>: ");
-
- printf ("Getting certificate cache, should be similar to last\n");
-
- if (
- (rv = pkcs11h_certificate_enumCertificateIds (
- PKCS11H_ENUM_METHOD_CACHE,
- NULL,
- PKCS11H_PROMPT_MASK_ALLOW_ALL,
- &issuers,
- &certs
- )) != CKR_OK
- ) {
- fatal ("pkcs11h_certificate_enumCertificateIds failed", rv);
- }
-
- for (temp = issuers;temp != NULL;temp = temp->next) {
- printf ("Issuer: %s\n", temp->certificate_id->displayName);
- }
- for (temp = certs;temp != NULL;temp = temp->next) {
- printf ("Certificate: %s\n", temp->certificate_id->displayName);
- }
-
- if (certs == NULL) {
- fatal ("No certificates found", rv);
- }
-
- printf ("Creating certificate context\n");
-
- if (
- (rv = pkcs11h_certificate_create (
- certs->certificate_id,
- NULL,
- PKCS11H_PROMPT_MASK_ALLOW_ALL,
- PKCS11H_PIN_CACHE_INFINITE,
- &cert
- )) != CKR_OK
- ) {
- fatal ("pkcs11h_certificate_create failed", rv);
- }
-
- printf ("Perforing signature #1 (you should be prompt for token and PIN)\n");
-
- sign_test (cert);
-
- printf ("Perforing signature #2 (you should NOT be prompt for anything)\n");
-
- sign_test (cert);
-
- mypause ("Please remove and insert token, press <Enter>: ");
-
- printf ("Perforing signature #3 (you should be prompt only for PIN)\n");
-
- sign_test (cert);
-
- printf ("Terminating pkcs11-helper\n");
-
- if ((rv = pkcs11h_terminate ()) != CKR_OK) {
- fatal ("pkcs11h_terminate failed", rv);
- }
-
- exit (0);
- return 0;
-}
-
-#endif
diff --git a/tests/test-slotevent/test-slotevent.c b/tests/test-slotevent/test-slotevent.c
deleted file mode 100644
index 7dfccc2..0000000
--- a/tests/test-slotevent/test-slotevent.c
+++ /dev/null
@@ -1,141 +0,0 @@
-#include "../../config.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if !defined(ENABLE_PKCS11H_SLOTEVENT)
-int main () {
- printf ("!win32, certificate, enum and crypto engine interfaces should be enabled for this test");
- exit (0);
- return 0;
-}
-#else
-
-#if defined(_WIN32)
-#include <windows.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <pkcs11-helper-1.0/pkcs11h-core.h>
-
-static
-void
-fatal (const char * const m, CK_RV rv) {
- fprintf (stderr, "%s - %08lu - %s\n", m, rv, pkcs11h_getMessage (rv));
- exit (1);
-}
-
-static
-void
-mypause (const char * const m) {
- char temp[10];
-
- fprintf (stdout, "%s", m);
- fgets (temp, sizeof (temp), stdin);
-}
-
-static
-void
-_pkcs11h_hooks_log (
- IN void * const global_data,
- IN unsigned flags,
- IN const char * const format,
- IN va_list args
-) {
- vfprintf (stdout, format, args);
- fprintf (stdout, "\n");
-}
-
-static
-void
-_pkcs11h_hooks_slotevent (
- IN void * const global_data
-) {
- printf ("slotevent\n");
-}
-
-int main () {
- CK_RV rv;
-
- printf ("Initializing pkcs11-helper\n");
-
- if ((rv = pkcs11h_initialize ()) != CKR_OK) {
- fatal ("pkcs11h_initialize failed", rv);
- }
-
- printf ("Registering pkcs11-helper hooks\n");
-
- if ((rv = pkcs11h_setLogHook (_pkcs11h_hooks_log, NULL)) != CKR_OK) {
- fatal ("pkcs11h_setLogHook failed", rv);
- }
-
- pkcs11h_setLogLevel (TEST_LOG_LEVEL);
-
- if ((rv = pkcs11h_setSlotEventHook (_pkcs11h_hooks_slotevent, NULL)) != CKR_OK) {
- fatal ("pkcs11h_setSlotEventHook failed", rv);
- }
-
- printf ("Adding provider '%s' as trigger\n", TEST_PROVIDER);
-
- if (
- (rv = pkcs11h_addProvider (
- TEST_PROVIDER,
- TEST_PROVIDER,
- FALSE,
- PKCS11H_PRIVATEMODE_MASK_AUTO,
- PKCS11H_SLOTEVENT_METHOD_TRIGGER,
- 0,
- FALSE
- )) != CKR_OK
- ) {
- fatal ("pkcs11h_terminate failed", rv);
- }
-
- printf ("Please remove and insert tokens (pause for 30 seconds)\n");
-
-#if defined(_WIN32)
- Sleep (30*1024);
-#else
- sleep (30);
-#endif
-
- if ((rv = pkcs11h_removeProvider (TEST_PROVIDER)) != CKR_OK) {
- fatal ("pkcs11h_removeProvider failed", rv);
- }
-
- printf ("Adding provider '%s' as poll\n", TEST_PROVIDER);
-
- if (
- (rv = pkcs11h_addProvider (
- TEST_PROVIDER,
- TEST_PROVIDER,
- FALSE,
- PKCS11H_PRIVATEMODE_MASK_AUTO,
- PKCS11H_SLOTEVENT_METHOD_POLL,
- 0,
- FALSE
- )) != CKR_OK
- ) {
- fatal ("pkcs11h_terminate failed", rv);
- }
-
- printf ("Please remove and insert tokens (pause for 30 seconds)\n");
-
-#if defined(_WIN32)
- Sleep (30*1024);
-#else
- sleep (30);
-#endif
-
- printf ("Terminating pkcs11-helper\n");
-
- if ((rv = pkcs11h_terminate ()) != CKR_OK) {
- fatal ("pkcs11h_terminate failed", rv);
- }
-
- exit (0);
- return 0;
-}
-
-#endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git
More information about the pkg-opensc-commit
mailing list