remove trailing whitespace
Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>
This commit is contained in:
parent
026b6ab43d
commit
60581ecc82
|
@ -208,15 +208,15 @@ static int itacns_add_cert(sc_pkcs15_card_t *p15card,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
SC_FUNC_CALLED(p15card->card->ctx, 1);
|
SC_FUNC_CALLED(p15card->card->ctx, 1);
|
||||||
|
|
||||||
if(type != SC_PKCS15_TYPE_CERT_X509) {
|
if(type != SC_PKCS15_TYPE_CERT_X509) {
|
||||||
sc_log(p15card->card->ctx,
|
sc_log(p15card->card->ctx,
|
||||||
"Cannot add a certificate of a type other than X.509");
|
"Cannot add a certificate of a type other than X.509");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
*ext_info_ok = 0;
|
*ext_info_ok = 0;
|
||||||
|
|
||||||
|
|
||||||
memset(&info, 0, sizeof(info));
|
memset(&info, 0, sizeof(info));
|
||||||
memset(&obj, 0, sizeof(obj));
|
memset(&obj, 0, sizeof(obj));
|
||||||
|
@ -312,7 +312,7 @@ static int itacns_add_prkey(sc_pkcs15_card_t *p15card,
|
||||||
SC_FUNC_CALLED(p15card->card->ctx, 1);
|
SC_FUNC_CALLED(p15card->card->ctx, 1);
|
||||||
|
|
||||||
if(type != SC_PKCS15_TYPE_PRKEY_RSA) {
|
if(type != SC_PKCS15_TYPE_PRKEY_RSA) {
|
||||||
sc_log(p15card->card->ctx,
|
sc_log(p15card->card->ctx,
|
||||||
"Cannot add a private key of a type other than RSA");
|
"Cannot add a private key of a type other than RSA");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -525,7 +525,7 @@ static int itacns_add_data_files(sc_pkcs15_card_t *p15card)
|
||||||
rv = sc_pkcs15_get_objects(p15card, SC_PKCS15_TYPE_DATA_OBJECT,
|
rv = sc_pkcs15_get_objects(p15card, SC_PKCS15_TYPE_DATA_OBJECT,
|
||||||
objs, 32);
|
objs, 32);
|
||||||
if(rv < 0) {
|
if(rv < 0) {
|
||||||
sc_log(p15card->card->ctx,
|
sc_log(p15card->card->ctx,
|
||||||
"Data enumeration failed");
|
"Data enumeration failed");
|
||||||
return SC_SUCCESS;
|
return SC_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -537,7 +537,7 @@ static int itacns_add_data_files(sc_pkcs15_card_t *p15card)
|
||||||
}
|
}
|
||||||
|
|
||||||
if(i>=32) {
|
if(i>=32) {
|
||||||
sc_log(p15card->card->ctx,
|
sc_log(p15card->card->ctx,
|
||||||
"Could not find EF_DatiPersonali: "
|
"Could not find EF_DatiPersonali: "
|
||||||
"keeping generic card name");
|
"keeping generic card name");
|
||||||
return SC_SUCCESS;
|
return SC_SUCCESS;
|
||||||
|
@ -545,7 +545,7 @@ static int itacns_add_data_files(sc_pkcs15_card_t *p15card)
|
||||||
|
|
||||||
rv = sc_pkcs15_read_data_object(p15card, cinfo, &p15_personaldata);
|
rv = sc_pkcs15_read_data_object(p15card, cinfo, &p15_personaldata);
|
||||||
if (rv) {
|
if (rv) {
|
||||||
sc_log(p15card->card->ctx,
|
sc_log(p15card->card->ctx,
|
||||||
"Could not read EF_DatiPersonali: "
|
"Could not read EF_DatiPersonali: "
|
||||||
"keeping generic card name");
|
"keeping generic card name");
|
||||||
return SC_SUCCESS;
|
return SC_SUCCESS;
|
||||||
|
@ -555,7 +555,7 @@ static int itacns_add_data_files(sc_pkcs15_card_t *p15card)
|
||||||
char fullname[160];
|
char fullname[160];
|
||||||
if(get_name_from_EF_DatiPersonali(p15_personaldata->data,
|
if(get_name_from_EF_DatiPersonali(p15_personaldata->data,
|
||||||
fullname, sizeof(fullname))) {
|
fullname, sizeof(fullname))) {
|
||||||
sc_log(p15card->card->ctx,
|
sc_log(p15card->card->ctx,
|
||||||
"Could not parse EF_DatiPersonali: "
|
"Could not parse EF_DatiPersonali: "
|
||||||
"keeping generic card name");
|
"keeping generic card name");
|
||||||
sc_pkcs15_free_data_object(p15_personaldata);
|
sc_pkcs15_free_data_object(p15_personaldata);
|
||||||
|
@ -661,7 +661,7 @@ static int itacns_check_and_add_keyset(sc_pkcs15_card_t *p15card,
|
||||||
|
|
||||||
/* Certificate */
|
/* Certificate */
|
||||||
if (!cert_path) {
|
if (!cert_path) {
|
||||||
sc_log(p15card->card->ctx,
|
sc_log(p15card->card->ctx,
|
||||||
"We cannot use keys without a matching certificate");
|
"We cannot use keys without a matching certificate");
|
||||||
return SC_ERROR_NOT_SUPPORTED;
|
return SC_ERROR_NOT_SUPPORTED;
|
||||||
}
|
}
|
||||||
|
@ -671,7 +671,7 @@ static int itacns_check_and_add_keyset(sc_pkcs15_card_t *p15card,
|
||||||
if (r == SC_ERROR_FILE_NOT_FOUND)
|
if (r == SC_ERROR_FILE_NOT_FOUND)
|
||||||
return 0;
|
return 0;
|
||||||
if (r != SC_SUCCESS) {
|
if (r != SC_SUCCESS) {
|
||||||
sc_log(p15card->card->ctx,
|
sc_log(p15card->card->ctx,
|
||||||
"Could not find certificate for %s", label);
|
"Could not find certificate for %s", label);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
@ -726,7 +726,7 @@ static int itacns_check_and_add_keyset(sc_pkcs15_card_t *p15card,
|
||||||
prkey_usage_flags |= SC_PKCS15_PRKEY_USAGE_DECRYPT;
|
prkey_usage_flags |= SC_PKCS15_PRKEY_USAGE_DECRYPT;
|
||||||
}
|
}
|
||||||
#else /* ENABLE_OPENSSL */
|
#else /* ENABLE_OPENSSL */
|
||||||
sc_log(p15card->card->ctx,
|
sc_log(p15card->card->ctx,
|
||||||
"Extended certificate info retrieved without OpenSSL. "
|
"Extended certificate info retrieved without OpenSSL. "
|
||||||
"How is this possible?");
|
"How is this possible?");
|
||||||
return SC_ERROR_INTERNAL;
|
return SC_ERROR_INTERNAL;
|
||||||
|
|
Loading…
Reference in New Issue