WolfSSL
/
wolfssl-examples
mirror of https://github.com/wolfSSL/wolfssl-examples.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #228 from SparkiDev/pkcs11_ecc 

PKCS#11: Update samples to handle no user pin and ECC type
pull/259/head
David Garske 2021-06-21 15:13:29 -07:00 committed by GitHub
parent b5382f0e19 dc35120793
commit 474bcec53d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkcs11/pkcs11_aescbc.c
View File

@ -87,16 +87,16 @@ int main(int argc, char* argv[])
int slotId;
int devId = 1;
if (argc != 5) {
if (argc != 4 && argc != 5) {
fprintf(stderr,
"Usage: pkcs11_aescbc <libname> <slot> <tokenname> <userpin>\n");
"Usage: pkcs11_aescbc <libname> <slot> <tokenname> [userpin]\n");
return 1;
}
library = argv[1];
slot = argv[2];
tokenName = argv[3];
userPin = argv[4];
userPin = (argc == 4) ? NULL : argv[4];
slotId = atoi(slot);
#if defined(DEBUG_WOLFSSL)
@ -111,7 +111,7 @@ int main(int argc, char* argv[])
}
if (ret == 0) {
ret = wc_Pkcs11Token_Init(&token, &dev, slotId, tokenName,
(byte*)userPin, strlen(userPin));
(byte*)userPin, userPin == NULL ? 0 : strlen(userPin));
if (ret != 0) {
fprintf(stderr, "Failed to initialize PKCS#11 token\n");
ret = 2;

8
pkcs11/pkcs11_aesgcm.c
View File

@ -90,16 +90,16 @@ int main(int argc, char* argv[])
int slotId;
int devId = 1;
if (argc != 5) {
if (argc != 4 && argc != 5) {
fprintf(stderr,
"Usage: pkcs11_aesgcm <libname> <slot> <tokenname> <userpin>\n");
"Usage: pkcs11_aesgcm <libname> <slot> <tokenname> [userpin]\n");
return 1;
}
library = argv[1];
slot = argv[2];
tokenName = argv[3];
userPin = argv[4];
userPin = (argc == 4) ? NULL : argv[4];
slotId = atoi(slot);
#if defined(DEBUG_WOLFSSL)
@ -114,7 +114,7 @@ int main(int argc, char* argv[])
}
if (ret == 0) {
ret = wc_Pkcs11Token_Init(&token, &dev, slotId, tokenName,
(byte*)userPin, strlen(userPin));
(byte*)userPin, userPin == NULL ? 0 : strlen(userPin));
if (ret != 0) {
fprintf(stderr, "Failed to initialize PKCS#11 token\n");
ret = 2;

8
pkcs11/pkcs11_ecc.c
View File

@ -163,16 +163,16 @@ int main(int argc, char* argv[])
int slotId;
int devId = 1;
if (argc != 5) {
if (argc != 4 && argc != 5) {
fprintf(stderr,
"Usage: pkcs11_ecc <libname> <slot> <tokenname> <userpin>\n");
"Usage: pkcs11_ecc <libname> <slot> <tokenname> [userpin]\n");
return 1;
}
library = argv[1];
slot = argv[2];
tokenName = argv[3];
userPin = argv[4];
userPin = (argc == 4) ? NULL : argv[4];
slotId = atoi(slot);
#if defined(DEBUG_WOLFSSL)
@ -187,7 +187,7 @@ int main(int argc, char* argv[])
}
if (ret == 0) {
ret = wc_Pkcs11Token_Init(&token, &dev, slotId, tokenName,
(byte*)userPin, strlen(userPin));
(byte*)userPin, userPin == NULL ? 0 : strlen(userPin));
if (ret != 0) {
fprintf(stderr, "Failed to initialize PKCS#11 token\n");
ret = 2;

11
pkcs11/pkcs11_genecc.c
View File

@ -38,7 +38,8 @@ int gen_ec_keys(Pkcs11Token* token, ecc_key* key, unsigned char* id, int idLen,
if (ret != 0)
fprintf(stderr, "Failed to initialize EC key: %d\n", ret);
if (ret == 0) {
ret = wc_ecc_make_key_ex(&rng, 32, key, ECC_CURVE_DEF);
ret = wc_ecc_make_key_ex2(&rng, 32, key, ECC_CURVE_DEF,
WC_ECC_FLAG_DEC_SIGN);
if (ret != 0)
fprintf(stderr, "Failed to generate EC key: %d\n", ret);
}
@ -98,16 +99,16 @@ int main(int argc, char* argv[])
int slotId;
int devId = 1;
if (argc != 5) {
if (argc != 4 && argc != 5) {
fprintf(stderr,
"Usage: pkcs11_genecc <libname> <slot> <tokenname> <userpin>\n");
"Usage: pkcs11_genecc <libname> <slot> <tokenname> [userpin]\n");
return 1;
}
library = argv[1];
slot = argv[2];
tokenName = argv[3];
userPin = argv[4];
userPin = (argc == 4) ? NULL : argv[4];
slotId = atoi(slot);
#if defined(DEBUG_WOLFSSL)
@ -122,7 +123,7 @@ int main(int argc, char* argv[])
}
if (ret == 0) {
ret = wc_Pkcs11Token_Init(&token, &dev, slotId, tokenName,
(byte*)userPin, strlen(userPin));
(byte*)userPin, userPin == NULL ? 0 : strlen(userPin));
if (ret != 0) {
fprintf(stderr, "Failed to initialize PKCS#11 token\n");
ret = 2;

8
pkcs11/pkcs11_hmac.c
View File

@ -75,16 +75,16 @@ int main(int argc, char* argv[])
int slotId;
int devId = 1;
if (argc != 5) {
if (argc != 4 && argc != 5) {
fprintf(stderr,
"Usage: pkcs11_aescbc <libname> <slot> <tokenname> <userpin>\n");
"Usage: pkcs11_aescbc <libname> <slot> <tokenname> [userpin]\n");
return 1;
}
library = argv[1];
slot = argv[2];
tokenName = argv[3];
userPin = argv[4];
userPin = (argc == 4) ? NULL : argv[4];
slotId = atoi(slot);
#if defined(DEBUG_WOLFSSL)
@ -99,7 +99,7 @@ int main(int argc, char* argv[])
}
if (ret == 0) {
ret = wc_Pkcs11Token_Init(&token, &dev, slotId, tokenName,
(byte*)userPin, strlen(userPin));
(byte*)userPin, userPin == NULL ? 0 : strlen(userPin));
if (ret != 0) {
fprintf(stderr, "Failed to initialize PKCS#11 token\n");
ret = 2;

8
pkcs11/pkcs11_rand.c
View File

@ -60,16 +60,16 @@ int main(int argc, char* argv[])
int devId = 1;
WC_RNG rng;
if (argc != 5) {
if (argc != 4 && argc != 5) {
fprintf(stderr,
"Usage: pkcs11_test <libname> <slot> <tokenname> <userpin>\n");
"Usage: pkcs11_test <libname> <slot> <tokenname> [userpin]\n");
return 1;
}
library = argv[1];
slot = argv[2];
tokenName = argv[3];
userPin = argv[4];
userPin = (argc == 4) ? NULL : argv[4];
slotId = atoi(slot);
#if defined(DEBUG_WOLFSSL)
@ -84,7 +84,7 @@ int main(int argc, char* argv[])
}
if (ret == 0) {
ret = wc_Pkcs11Token_Init(&token, &dev, slotId, tokenName,
(byte*)userPin, strlen(userPin));
(byte*)userPin, userPin == NULL ? 0 : strlen(userPin));
if (ret != 0) {
fprintf(stderr, "Failed to initialize PKCS#11 token\n");
ret = 2;

8
pkcs11/pkcs11_rsa.c
View File

@ -283,16 +283,16 @@ int main(int argc, char* argv[])
int slotId;
int devId = 1;
if (argc != 5) {
if (argc != 4 && argc != 5) {
fprintf(stderr,
"Usage: pkcs11_rsa <libname> <slot> <tokenname> <userpin>\n");
"Usage: pkcs11_rsa <libname> <slot> <tokenname> [userpin]\n");
return 1;
}
library = argv[1];
slot = argv[2];
tokenName = argv[3];
userPin = argv[4];
userPin = (argc == 4) ? NULL : argv[4];
slotId = atoi(slot);
#if defined(DEBUG_WOLFSSL)
@ -307,7 +307,7 @@ int main(int argc, char* argv[])
}
else {
ret = wc_Pkcs11Token_Init(&token, &dev, slotId, tokenName,
(byte*)userPin, strlen(userPin));
(byte*)userPin, userPin == NULL ? 0 : strlen(userPin));
if (ret != 0) {
fprintf(stderr, "Failed to initialize PKCS#11 token\n");
ret = 2;

13
pkcs11/pkcs11_test.c
View File

@ -486,6 +486,11 @@ int ecdh_test(ecc_key* privKey, ecc_key* pubKey, int check)
byte out[256/8];
word32 outSz = sizeof(out);
#if defined(ECC_TIMING_RESISTANT) && (!defined(HAVE_FIPS) || \
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION != 2))) && \
!defined(HAVE_SELFTEST)
ret = wc_ecc_set_rng(privKey, &rng);
#endif
if (ret == 0) {
ret = wc_ecc_shared_secret(privKey, pubKey, out, &outSz);
if (ret < 0)
@ -1119,16 +1124,16 @@ int main(int argc, char* argv[])
int slotId;
int devId = 1;
if (argc != 5) {
if (argc != 4 && argc != 5) {
fprintf(stderr,
"Usage: pkcs11_test <libname> <slot> <tokenname> <userpin>\n");
"Usage: pkcs11_test <libname> <slot> <tokenname> [userpin]\n");
return 1;
}
library = argv[1];
slot = argv[2];
tokenName = argv[3];
userPin = argv[4];
userPin = (argc == 4) ? NULL : argv[4];
slotId = atoi(slot);
#if defined(DEBUG_WOLFSSL)
@ -1143,7 +1148,7 @@ int main(int argc, char* argv[])
}
if (ret == 0) {
ret = wc_Pkcs11Token_Init(&token, &dev, slotId, tokenName,
(byte*)userPin, strlen(userPin));
(byte*)userPin, userPin == NULL ? 0 : strlen(userPin));
if (ret != 0) {
fprintf(stderr, "Failed to initialize PKCS#11 token\n");
ret = 2;

8
pkcs11/server-tls-pkcs11-ecc.c
View File

@ -229,16 +229,16 @@ int main(int argc, char* argv[])
int slotId;
int devId = 1;
if (argc != 5) {
if (argc != 4 && argc != 5) {
fprintf(stderr,
"Usage: server_tls_pkcs11 <libname> <slot> <tokenname> <userpin>\n");
"Usage: server_tls_pkcs11 <libname> <slot> <tokenname> [userpin]\n");
return 1;
}
library = argv[1];
slot = argv[2];
tokenName = argv[3];
userPin = argv[4];
userPin = (argc == 4) ? NULL : argv[4];
slotId = atoi(slot);
#if defined(DEBUG_WOLFSSL)
@ -253,7 +253,7 @@ int main(int argc, char* argv[])
}
if (ret == 0) {
ret = wc_Pkcs11Token_Init(&token, &dev, slotId, tokenName,
(byte*)userPin, strlen(userPin));
(byte*)userPin, userPin == NULL ? 0 : strlen(userPin));
if (ret != 0) {
fprintf(stderr, "Failed to initialize PKCS#11 token\n");
ret = 2;

8
pkcs11/server-tls-pkcs11.c
View File

@ -229,16 +229,16 @@ int main(int argc, char* argv[])
int slotId;
int devId = 1;
if (argc != 5) {
if (argc != 4 && argc != 5) {
fprintf(stderr,
"Usage: server_tls_pkcs11 <libname> <slot> <tokenname> <userpin>\n");
"Usage: server_tls_pkcs11 <libname> <slot> <tokenname> [userpin]\n");
return 1;
}
library = argv[1];
slot = argv[2];
tokenName = argv[3];
userPin = argv[4];
userPin = (argc == 4) ? NULL : argv[4];
slotId = atoi(slot);
#if defined(DEBUG_WOLFSSL)
@ -253,7 +253,7 @@ int main(int argc, char* argv[])
}
if (ret == 0) {
ret = wc_Pkcs11Token_Init(&token, &dev, slotId, tokenName,
(byte*)userPin, strlen(userPin));
(byte*)userPin, userPin == NULL ? 0 : strlen(userPin));
if (ret != 0) {
fprintf(stderr, "Failed to initialize PKCS#11 token\n");
ret = 2;