summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-05-09 08:49:43 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-05-09 08:49:43 +0200
commit4cb8e17aa3972e27f4b34e5bb2df9e7007824ac2 (patch)
tree942b24dcd275407d76f6b3ef85f6db9af1160163 /crypto
parent854df603da65bc56fe72218b402903f26155b0f0 (diff)
parent79fdb84a6b46f7c129225b57007b63e765747d52 (diff)
downloadbarebox-4cb8e17aa3972e27f4b34e5bb2df9e7007824ac2.tar.gz
barebox-4cb8e17aa3972e27f4b34e5bb2df9e7007824ac2.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'crypto')
-rw-r--r--crypto/digest.c2
-rw-r--r--crypto/sha2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/digest.c b/crypto/digest.c
index 46600f246e..7a8c3c092d 100644
--- a/crypto/digest.c
+++ b/crypto/digest.c
@@ -77,7 +77,7 @@ int digest_generic_digest(struct digest *d, const void *data,
int digest_algo_register(struct digest_algo *d)
{
- if (!d || !d->base.name || !d->update || !d->final || !d->verify)
+ if (!d || !d->base.name || !d->update || !d->final || !d->verify)
return -EINVAL;
if (!d->init)
diff --git a/crypto/sha2.c b/crypto/sha2.c
index df566c8a4b..cb0f11c77e 100644
--- a/crypto/sha2.c
+++ b/crypto/sha2.c
@@ -13,7 +13,7 @@
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
+ * Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
*/