hx509: Fix spelling of error messages
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
This commit is contained in:

committed by
Jeffrey Altman

parent
d9d3dd448d
commit
61bf5009a0
@@ -952,7 +952,7 @@ hx509_cert_find_subjectAltName_otherName(hx509_context context,
|
|||||||
ret = add_to_list(list, &sa.val[j].u.otherName.value);
|
ret = add_to_list(list, &sa.val[j].u.otherName.value);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
hx509_set_error_string(context, 0, ret,
|
hx509_set_error_string(context, 0, ret,
|
||||||
"Error adding an exra SAN to "
|
"Error adding an extra SAN to "
|
||||||
"return list");
|
"return list");
|
||||||
hx509_free_octet_string_list(list);
|
hx509_free_octet_string_list(list);
|
||||||
free_GeneralNames(&sa);
|
free_GeneralNames(&sa);
|
||||||
|
@@ -247,7 +247,7 @@ unparse_CMSIdentifier(hx509_context context,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
ret = asprintf(str, "certificate have unknown CMSidentifier type");
|
ret = asprintf(str, "certificate has unknown CMSidentifier type");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
@@ -936,7 +936,7 @@ hx509_cms_verify_signed_ext(hx509_context context,
|
|||||||
ret = HX509_CMS_MISSING_SIGNER_DATA;
|
ret = HX509_CMS_MISSING_SIGNER_DATA;
|
||||||
hx509_set_error_string(context, 0, ret,
|
hx509_set_error_string(context, 0, ret,
|
||||||
"SignerInfo %zu in SignedData "
|
"SignerInfo %zu in SignedData "
|
||||||
"missing sigature", i);
|
"missing signature", i);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -974,7 +974,7 @@ hx509_cms_verify_signed_ext(hx509_context context,
|
|||||||
if (attr == NULL) {
|
if (attr == NULL) {
|
||||||
ret = HX509_CRYPTO_SIGNATURE_MISSING;
|
ret = HX509_CRYPTO_SIGNATURE_MISSING;
|
||||||
hx509_set_error_string(context, 0, ret,
|
hx509_set_error_string(context, 0, ret,
|
||||||
"SignerInfo have signed attributes "
|
"SignerInfo has signed attributes "
|
||||||
"but messageDigest (signature) "
|
"but messageDigest (signature) "
|
||||||
"is missing");
|
"is missing");
|
||||||
goto next_sigature;
|
goto next_sigature;
|
||||||
@@ -982,7 +982,7 @@ hx509_cms_verify_signed_ext(hx509_context context,
|
|||||||
if (attr->value.len != 1) {
|
if (attr->value.len != 1) {
|
||||||
ret = HX509_CRYPTO_SIGNATURE_MISSING;
|
ret = HX509_CRYPTO_SIGNATURE_MISSING;
|
||||||
hx509_set_error_string(context, 0, ret,
|
hx509_set_error_string(context, 0, ret,
|
||||||
"SignerInfo have more then one "
|
"SignerInfo has more than one "
|
||||||
"messageDigest (signature)");
|
"messageDigest (signature)");
|
||||||
goto next_sigature;
|
goto next_sigature;
|
||||||
}
|
}
|
||||||
@@ -1021,7 +1021,7 @@ hx509_cms_verify_signed_ext(hx509_context context,
|
|||||||
if (attr->value.len != 1) {
|
if (attr->value.len != 1) {
|
||||||
ret = HX509_CMS_DATA_OID_MISMATCH;
|
ret = HX509_CMS_DATA_OID_MISMATCH;
|
||||||
hx509_set_error_string(context, 0, ret,
|
hx509_set_error_string(context, 0, ret,
|
||||||
"More then one oid in signedAttrs");
|
"More than one oid in signedAttrs");
|
||||||
goto next_sigature;
|
goto next_sigature;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1127,7 +1127,7 @@ hx509_cms_verify_signed_ext(hx509_context context,
|
|||||||
if (ret == 0) {
|
if (ret == 0) {
|
||||||
ret = HX509_CMS_SIGNER_NOT_FOUND;
|
ret = HX509_CMS_SIGNER_NOT_FOUND;
|
||||||
hx509_set_error_string(context, 0, ret,
|
hx509_set_error_string(context, 0, ret,
|
||||||
"No signers where found");
|
"No signers were found");
|
||||||
}
|
}
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
@@ -462,7 +462,7 @@ ecdsa_create_signature(hx509_context context,
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
if (siglen > sig->length)
|
if (siglen > sig->length)
|
||||||
_hx509_abort("ECDSA signature prelen longer the output len");
|
_hx509_abort("ECDSA signature prelen longer than output len");
|
||||||
|
|
||||||
sig->length = siglen;
|
sig->length = siglen;
|
||||||
|
|
||||||
|
@@ -391,7 +391,7 @@ rsa_create_signature(hx509_context context,
|
|||||||
memmove((uint8_t *)sig->data + size, sig->data, ret);
|
memmove((uint8_t *)sig->data + size, sig->data, ret);
|
||||||
memset(sig->data, 0, size);
|
memset(sig->data, 0, size);
|
||||||
} else if (sig->length < (size_t)ret)
|
} else if (sig->length < (size_t)ret)
|
||||||
_hx509_abort("RSA signature prelen longer the output len");
|
_hx509_abort("RSA signature prelen longer than output len");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -738,7 +738,7 @@ evp_md_verify_signature(hx509_context context,
|
|||||||
|
|
||||||
if (sig->length != sigsize || sigsize > sizeof(digest)) {
|
if (sig->length != sigsize || sigsize > sizeof(digest)) {
|
||||||
hx509_set_error_string(context, 0, HX509_CRYPTO_SIG_INVALID_FORMAT,
|
hx509_set_error_string(context, 0, HX509_CRYPTO_SIG_INVALID_FORMAT,
|
||||||
"SHA256 sigature have wrong length");
|
"SHA256 sigature has wrong length");
|
||||||
return HX509_CRYPTO_SIG_INVALID_FORMAT;
|
return HX509_CRYPTO_SIG_INVALID_FORMAT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -74,7 +74,7 @@ index 96
|
|||||||
prefix HX509
|
prefix HX509
|
||||||
error_code CRL_USED_BEFORE_TIME, "CRL used before it became valid"
|
error_code CRL_USED_BEFORE_TIME, "CRL used before it became valid"
|
||||||
error_code CRL_USED_AFTER_TIME, "CRL used after it became invalid"
|
error_code CRL_USED_AFTER_TIME, "CRL used after it became invalid"
|
||||||
error_code CRL_INVALID_FORMAT, "CRL have invalid format"
|
error_code CRL_INVALID_FORMAT, "CRL has invalid format"
|
||||||
error_code CERT_REVOKED, "Certificate is revoked"
|
error_code CERT_REVOKED, "Certificate is revoked"
|
||||||
error_code REVOKE_STATUS_MISSING, "No revoke status found for certificates"
|
error_code REVOKE_STATUS_MISSING, "No revoke status found for certificates"
|
||||||
error_code CRL_UNKNOWN_EXTENSION, "Unknown extension"
|
error_code CRL_UNKNOWN_EXTENSION, "Unknown extension"
|
||||||
|
@@ -193,7 +193,7 @@ hx509_request_get_name(hx509_context context,
|
|||||||
hx509_name *name)
|
hx509_name *name)
|
||||||
{
|
{
|
||||||
if (req->name == NULL) {
|
if (req->name == NULL) {
|
||||||
hx509_set_error_string(context, 0, EINVAL, "Request have no name");
|
hx509_set_error_string(context, 0, EINVAL, "Request has no name");
|
||||||
return EINVAL;
|
return EINVAL;
|
||||||
}
|
}
|
||||||
return hx509_name_copy(context, req->name, name);
|
return hx509_name_copy(context, req->name, name);
|
||||||
|
@@ -412,7 +412,7 @@ hx509_revoke_add_ocsp(hx509_context context,
|
|||||||
|
|
||||||
if (strncmp(path, "FILE:", 5) != 0) {
|
if (strncmp(path, "FILE:", 5) != 0) {
|
||||||
hx509_set_error_string(context, 0, HX509_UNSUPPORTED_OPERATION,
|
hx509_set_error_string(context, 0, HX509_UNSUPPORTED_OPERATION,
|
||||||
"unsupport type in %s", path);
|
"unsupported type in %s", path);
|
||||||
return HX509_UNSUPPORTED_OPERATION;
|
return HX509_UNSUPPORTED_OPERATION;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -926,7 +926,7 @@ add_to_req(hx509_context context, void *ptr, hx509_cert cert)
|
|||||||
if (hx509_cert_cmp(ctx->parent, parent) != 0) {
|
if (hx509_cert_cmp(ctx->parent, parent) != 0) {
|
||||||
ret = HX509_REVOKE_NOT_SAME_PARENT;
|
ret = HX509_REVOKE_NOT_SAME_PARENT;
|
||||||
hx509_set_error_string(context, 0, ret,
|
hx509_set_error_string(context, 0, ret,
|
||||||
"Not same parent certifate as "
|
"Not same parent certificate as "
|
||||||
"last certificate in request");
|
"last certificate in request");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
@@ -99,7 +99,7 @@ ${hxtool} cms-verify-sd \
|
|||||||
--missing-revoke \
|
--missing-revoke \
|
||||||
--anchors=FILE:$srcdir/data/ca.crt \
|
--anchors=FILE:$srcdir/data/ca.crt \
|
||||||
sd.data sd.data.out 2> signer.tmp && exit 1
|
sd.data sd.data.out 2> signer.tmp && exit 1
|
||||||
grep "No signers where found" signer.tmp > /dev/null || exit 1
|
grep "No signers were found" signer.tmp > /dev/null || exit 1
|
||||||
|
|
||||||
echo "create signed data (id-by-name)"
|
echo "create signed data (id-by-name)"
|
||||||
${hxtool} cms-create-sd \
|
${hxtool} cms-create-sd \
|
||||||
|
Reference in New Issue
Block a user