Drop localisation and checkpoint tracing in files not covered by the merge.

This commit is contained in:
Guus Sliepen 2009-09-29 15:19:55 +02:00
parent 7ea85043ac
commit 07a560eab6
11 changed files with 102 additions and 109 deletions

View file

@ -189,7 +189,7 @@ bool rsa_set_hex_public_key(rsa_t *rsa, char *n, char *e) {
?: gcry_mpi_scan(&rsa->e, GCRYMPI_FMT_HEX, n, 0, NULL);
if(err) {
logger(LOG_ERR, _("Error while reading RSA public key: %s"), gcry_strerror(errno));
logger(LOG_ERR, "Error while reading RSA public key: %s", gcry_strerror(errno));
return false;
}
@ -204,7 +204,7 @@ bool rsa_set_hex_private_key(rsa_t *rsa, char *n, char *e, char *d) {
?: gcry_mpi_scan(&rsa->d, GCRYMPI_FMT_HEX, n, 0, NULL);
if(err) {
logger(LOG_ERR, _("Error while reading RSA public key: %s"), gcry_strerror(errno));
logger(LOG_ERR, "Error while reading RSA public key: %s", gcry_strerror(errno));
return false;
}
@ -218,7 +218,7 @@ bool rsa_read_pem_public_key(rsa_t *rsa, FILE *fp) {
size_t derlen;
if(!pem_decode(fp, "RSA PUBLIC KEY", derbuf, sizeof derbuf, &derlen)) {
logger(LOG_ERR, _("Unable to read RSA public key: %s"), strerror(errno));
logger(LOG_ERR, "Unable to read RSA public key: %s", strerror(errno));
return NULL;
}
@ -226,7 +226,7 @@ bool rsa_read_pem_public_key(rsa_t *rsa, FILE *fp) {
|| !ber_read_mpi(&derp, &derlen, &rsa->n)
|| !ber_read_mpi(&derp, &derlen, &rsa->e)
|| derlen) {
logger(LOG_ERR, _("Error while decoding RSA public key"));
logger(LOG_ERR, "Error while decoding RSA public key");
return NULL;
}
@ -238,7 +238,7 @@ bool rsa_read_pem_private_key(rsa_t *rsa, FILE *fp) {
size_t derlen;
if(!pem_decode(fp, "RSA PRIVATE KEY", derbuf, sizeof derbuf, &derlen)) {
logger(LOG_ERR, _("Unable to read RSA private key: %s"), strerror(errno));
logger(LOG_ERR, "Unable to read RSA private key: %s", strerror(errno));
return NULL;
}
@ -253,7 +253,7 @@ bool rsa_read_pem_private_key(rsa_t *rsa, FILE *fp) {
|| !ber_read_mpi(&derp, &derlen, NULL)
|| !ber_read_mpi(&derp, &derlen, NULL) // u
|| derlen) {
logger(LOG_ERR, _("Error while decoding RSA private key"));
logger(LOG_ERR, "Error while decoding RSA private key");
return NULL;
}