Skip to content

Commit 1cc222e

Browse files
committed
sign: Fix typo in error messages and comments
Signed-off-by: Daiki Ueno <dueno@redhat.com>
1 parent 28c184f commit 1cc222e

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

man/ostree-sign.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ License along with this library. If not, see <https://www.gnu.org/licenses/>.
8181
<listitem><para><filename>/etc/ostree/trusted.ed25519.d</filename></para></listitem>
8282
<listitem><para><filename>/etc/ostree/revoked.ed25519.d</filename></para></listitem>
8383
<listitem><para><filename>/usr/share/ostree/trusted.ed25519.d</filename></para></listitem>
84-
<listitem><para><filename>/usr/share/ostree/rvokeded.ed25519.d</filename></para></listitem>
84+
<listitem><para><filename>/usr/share/ostree/revoked.ed25519.d</filename></para></listitem>
8585
</itemizedlist>
8686
</para>
8787
</refsect1>

src/libostree/ostree-sign-ed25519.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ validate_length (gsize found, gsize expected, GError **error)
103103
return TRUE;
104104
return glnx_throw (
105105
error, "Ill-formed input: expected %" G_GSIZE_FORMAT " bytes, got %" G_GSIZE_FORMAT " bytes",
106-
found, expected);
106+
expected, found);
107107
}
108108

109109
static gboolean
@@ -152,7 +152,7 @@ ostree_sign_ed25519_data (OstreeSign *self, GBytes *data, GBytes **signature,
152152
if (!pkey)
153153
{
154154
EVP_MD_CTX_free (ctx);
155-
return glnx_throw (error, "openssl: Failed to initialize ed5519 key");
155+
return glnx_throw (error, "openssl: Failed to initialize ed25519 key");
156156
}
157157

158158
size_t len;

src/libotcore/otcore-ed25519-verify.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ otcore_validate_ed25519_signature (GBytes *data, GBytes *public_key, GBytes *sig
9797
if (!pkey)
9898
{
9999
EVP_MD_CTX_free (ctx);
100-
return glnx_throw (error, "openssl: Failed to initialize ed5519 key");
100+
return glnx_throw (error, "openssl: Failed to initialize ed25519 key");
101101
}
102102
if (EVP_DigestVerifyInit (ctx, NULL, NULL, NULL, pkey) != 0
103103
&& EVP_DigestVerify (ctx, signature_buf, OSTREE_SIGN_ED25519_SIG_SIZE,

tests/test-signed-commit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ ${CMD_PREFIX} ostree --repo=${test_tmpdir}/repo sign --verify --sign-type=ed255
101101
${CMD_PREFIX} ostree --repo=${test_tmpdir}/repo sign --verify --sign-type=ed25519 ${COMMIT} $(gen_ed25519_random_public) $(gen_ed25519_random_public) ${PUBLIC} $(gen_ed25519_random_public) $(gen_ed25519_random_public)
102102
echo "ok ed25519 signature verified"
103103

104-
# Check if we able to use all available modules to sign the same commit
104+
# Check if we are able to use all available modules to sign the same commit
105105
echo "Unsigned commit for multi-sign" >> file.txt
106106
${CMD_PREFIX} ostree --repo=${test_tmpdir}/repo commit -b main -s 'Unsigned commit'
107107
COMMIT="$(ostree --repo=${test_tmpdir}/repo rev-parse main)"

0 commit comments

Comments
 (0)