commit e17f71f9f01a429664caf120d9ac159ed9f5283f
parent 36333f75234a6cb1b98cbe104aee3506d6bec9a1
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 27 Mar 2015 13:28:03 +0000
- added sha512 (buggy, need to commit to test somewhere else)
- version bump (not a rc yet)
- bugfix: buffer_get returned -1 EPIPE on short reads w/o EOF
Diffstat:
15 files changed, 219 insertions(+), 16 deletions(-)
diff --git a/doc/index.html b/doc/index.html
@@ -59,7 +59,7 @@ with a standard C development environment </li>
<h3> Download </h3>
<ul>
- <li> The current released version of skalibs is <a href="skalibs-2.3.2.0.tar.gz">2.3.2.0</a>. </li>
+ <li> The current released version of skalibs is <a href="skalibs-2.3.3.0.tar.gz">2.3.3.0</a>. </li>
<li> Alternatively, you can checkout a copy of the skalibs git repository:
<pre> git clone git://git.skarnet.org/skalibs </pre> </li>
</ul>
diff --git a/doc/libstdcrypto/index.html b/doc/libstdcrypto/index.html
@@ -29,6 +29,7 @@ operations are provided:
<li> md5 </li>
<li> sha1 </li>
<li> sha256 </li>
+ <li> sha512 </li>
</ul>
<h2> Compiling </h2>
@@ -127,6 +128,25 @@ SHA256 </h3>
<li> <tt>sha256_final()</tt> computes the digest </li>
</ul>
+<h3> <a name="sha512"></a>
+SHA512 </h3>
+
+<pre>
+ SHA512Schedule ctx ;
+ char const *message ;
+ unsigned int messagelen ;
+ char digest[64] ;
+
+ sha512_init(&ctx) ;
+ sha512_update(&ctx, message, messagelen) ;
+ sha512_final(&ctx, digest) ;
+</pre>
+
+<ul>
+ <li> <tt>sha512_init()</tt> prepares a SHA512Schedule structure for computation </li>
+ <li> <tt>sha512_update()</tt> adds <em>message</em> to the message to be digested </li>
+ <li> <tt>sha512_final()</tt> computes the digest </li>
+</ul>
</body>
</html>
diff --git a/doc/upgrade.html b/doc/upgrade.html
@@ -17,6 +17,12 @@
<h1> What has changed in skalibs </h1>
+<h2> in 2.3.3.0 </h2>
+
+<ul>
+ <li> New sha512 functions, see <tt>skalibs/sha512.h</tt> </li>
+</ul>
+
<h2> in 2.3.2.0 </h2>
<ul>
diff --git a/package/deps.mak b/package/deps.mak
@@ -37,13 +37,14 @@ src/include/skalibs/random.h: src/include/skalibs/gccattributes.h src/include/sk
src/include/skalibs/rrandom.h: src/include/skalibs/unirandom.h
src/include/skalibs/sha1.h: src/include/skalibs/uint32.h
src/include/skalibs/sha256.h: src/include/skalibs/uint32.h
+src/include/skalibs/sha512.h: src/include/skalibs/uint64.h
src/include/skalibs/sig.h: src/include/skalibs/gccattributes.h
src/include/skalibs/siovec.h: src/include/skalibs/gccattributes.h
src/include/skalibs/skaclient.h: src/include/skalibs/kolbak.h src/include/skalibs/siovec.h src/include/skalibs/tai.h src/include/skalibs/uint32.h src/include/skalibs/unixmessage.h
src/include/skalibs/skalibs.h: src/include/skalibs/biguint.h src/include/skalibs/datastruct.h src/include/skalibs/random.h src/include/skalibs/stdcrypto.h src/include/skalibs/stddjb.h src/include/skalibs/unixonacid.h
src/include/skalibs/skamisc.h: src/include/skalibs/buffer.h src/include/skalibs/stralloc.h
src/include/skalibs/socket.h: src/include/skalibs/djbunix.h src/include/skalibs/gccattributes.h src/include/skalibs/tai.h src/include/skalibs/uint16.h src/include/skalibs/uint32.h src/include/skalibs/webipc.h
-src/include/skalibs/stdcrypto.h: src/include/skalibs/md5.h src/include/skalibs/rc4.h src/include/skalibs/sha1.h src/include/skalibs/sha256.h
+src/include/skalibs/stdcrypto.h: src/include/skalibs/md5.h src/include/skalibs/rc4.h src/include/skalibs/sha1.h src/include/skalibs/sha256.h src/include/skalibs/sha512.h
src/include/skalibs/stddjb.h: src/include/skalibs/alloc.h src/include/skalibs/allreadwrite.h src/include/skalibs/bitarray.h src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/bytestr.h src/include/skalibs/cbuffer.h src/include/skalibs/cdb.h src/include/skalibs/cdb_make.h src/include/skalibs/config.h src/include/skalibs/direntry.h src/include/skalibs/diuint.h src/include/skalibs/diuint32.h src/include/skalibs/djbtime.h src/include/skalibs/djbunix.h src/include/skalibs/env.h src/include/skalibs/envalloc.h src/include/skalibs/environ.h src/include/skalibs/error.h src/include/skalibs/fmtscan.h src/include/skalibs/functypes.h src/include/skalibs/gccattributes.h src/include/skalibs/genalloc.h src/include/skalibs/genwrite.h src/include/skalibs/getpeereid.h src/include/skalibs/gidstuff.h src/include/skalibs/iobuffer.h src/include/skalibs/iopause.h src/include/skalibs/ip46.h src/include/skalibs/lolstdio.h src/include/skalibs/mininetstring.h src/include/skalibs/netstring.h src/include/skalibs/nsig.h src/include/skalibs/segfault.h src/include/skalibs/selfpipe.h src/include/skalibs/setgroups.h src/include/skalibs/sgetopt.h src/include/skalibs/sig.h src/include/skalibs/siovec.h src/include/skalibs/skamisc.h src/include/skalibs/socket.h src/include/skalibs/stralloc.h src/include/skalibs/strerr.h src/include/skalibs/strerr2.h src/include/skalibs/tai.h src/include/skalibs/uint.h src/include/skalibs/uint16.h src/include/skalibs/uint32.h src/include/skalibs/uint64.h src/include/skalibs/ulong.h src/include/skalibs/ushort.h src/include/skalibs/webipc.h
src/include/skalibs/stralloc.h: src/include/skalibs/bytestr.h src/include/skalibs/siovec.h
src/include/skalibs/strerr.h: src/include/skalibs/gccattributes.h
@@ -65,6 +66,7 @@ src/librandom/random-internal.h: src/include/skalibs/gccattributes.h src/include
src/libstdcrypto/md5-internal.h: src/include/skalibs/md5.h src/include/skalibs/uint32.h
src/libstdcrypto/sha1-internal.h: src/include/skalibs/sha1.h src/include/skalibs/uint32.h
src/libstdcrypto/sha256-internal.h: src/include/skalibs/sha256.h src/include/skalibs/uint32.h
+src/libstdcrypto/sha512-internal.h: src/include/skalibs/sha512.h
src/libstddjb/alloc-internal.h: src/include/skalibs/alloc.h src/include/skalibs/sysdeps.h
src/libstddjb/djbtime-internal.h: src/include/skalibs/config.h src/include/skalibs/uint64.h
src/libstddjb/fmtscan-internal.h: src/include/skalibs/bytestr.h src/include/skalibs/fmtscan.h
@@ -189,6 +191,10 @@ src/libstdcrypto/sha256_final.o src/libstdcrypto/sha256_final.lo: src/libstdcryp
src/libstdcrypto/sha256_init.o src/libstdcrypto/sha256_init.lo: src/libstdcrypto/sha256_init.c src/include/skalibs/sha256.h
src/libstdcrypto/sha256_transform.o src/libstdcrypto/sha256_transform.lo: src/libstdcrypto/sha256_transform.c src/libstdcrypto/sha256-internal.h src/include/skalibs/uint32.h
src/libstdcrypto/sha256_update.o src/libstdcrypto/sha256_update.lo: src/libstdcrypto/sha256_update.c src/libstdcrypto/sha256-internal.h src/include/skalibs/sha256.h
+src/libstdcrypto/sha512_final.o src/libstdcrypto/sha512_final.lo: src/libstdcrypto/sha512_final.c src/include/skalibs/bytestr.h src/libstdcrypto/sha512-internal.h src/include/skalibs/sha512.h src/include/skalibs/uint64.h
+src/libstdcrypto/sha512_init.o src/libstdcrypto/sha512_init.lo: src/libstdcrypto/sha512_init.c src/include/skalibs/sha512.h
+src/libstdcrypto/sha512_transform.o src/libstdcrypto/sha512_transform.lo: src/libstdcrypto/sha512_transform.c src/libstdcrypto/sha512-internal.h src/include/skalibs/sha512.h src/include/skalibs/uint64.h
+src/libstdcrypto/sha512_update.o src/libstdcrypto/sha512_update.lo: src/libstdcrypto/sha512_update.c src/include/skalibs/bytestr.h src/libstdcrypto/sha512-internal.h src/include/skalibs/sha512.h
src/libstddjb/absolutepath.o src/libstddjb/absolutepath.lo: src/libstddjb/absolutepath.c src/include/skalibs/djbunix.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h
src/libstddjb/absolutepath_tmp.o src/libstddjb/absolutepath_tmp.lo: src/libstddjb/absolutepath_tmp.c src/include/skalibs/bytestr.h src/include/skalibs/djbunix.h src/include/skalibs/stralloc.h
src/libstddjb/alloc.o src/libstddjb/alloc.lo: src/libstddjb/alloc.c src/libstddjb/alloc-internal.h src/include/skalibs/alloc.h src/include/skalibs/sysdeps.h
diff --git a/package/info b/package/info
@@ -1,4 +1,4 @@
package=skalibs
-version=2.3.2.0
+version=2.3.3.0
category=prog
package_macro_name=SKALIBS
diff --git a/src/include/skalibs/sha512.h b/src/include/skalibs/sha512.h
@@ -0,0 +1,21 @@
+/* ISC license. */
+
+#ifndef SHA512_H
+#define SHA512_H
+
+#include <skalibs/uint64.h>
+
+typedef struct SHA512Schedule_s SHA512Schedule, *SHA512Schedule_ref ;
+struct SHA512Schedule_s
+{
+ uint64 len ;
+ uint64 h[8] ;
+ unsigned char buf[128] ;
+} ;
+
+#define SHA512_INIT() { .len = 0, .h = { 0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL, 0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL, 0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL, 0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL } }
+extern void sha512_init (SHA512Schedule *) ;
+extern void sha512_update (SHA512Schedule *, char const *, unsigned int) ;
+extern void sha512_final (SHA512Schedule *, char *digest) ;
+
+#endif
diff --git a/src/include/skalibs/stdcrypto.h b/src/include/skalibs/stdcrypto.h
@@ -7,5 +7,6 @@
#include <skalibs/md5.h>
#include <skalibs/sha1.h>
#include <skalibs/sha256.h>
+#include <skalibs/sha512.h>
#endif
diff --git a/src/libstdcrypto/INCLUDE b/src/libstdcrypto/INCLUDE
@@ -1,5 +0,0 @@
-rc4.h
-md5.h
-sha1.h
-sha256.h
-stdcrypto.h
diff --git a/src/libstdcrypto/Makefile b/src/libstdcrypto/Makefile
@@ -1,7 +0,0 @@
-it: EXPORT- .done
-
-EXPORT-: gen-EXPORT
- exec ./gen-EXPORT > EXPORT-
-
-.done: gen-Makefile
- ./gen-Makefile > Makefile.real && make -f Makefile.real && : > .done
diff --git a/src/libstdcrypto/sha512-internal.h b/src/libstdcrypto/sha512-internal.h
@@ -0,0 +1,10 @@
+/* ISC license. */
+
+#ifndef SHA512_INTERNAL_H
+#define SHA512_INTERNAL_H
+
+#include <skalibs/sha512.h>
+
+extern void sha512_transform (SHA512Schedule *ctx, unsigned char const *block) ;
+
+#endif
diff --git a/src/libstdcrypto/sha512_final.c b/src/libstdcrypto/sha512_final.c
@@ -0,0 +1,25 @@
+/* ISC license. */
+
+#include <skalibs/bytestr.h>
+#include <skalibs/uint64.h>
+#include <skalibs/sha512.h>
+#include "sha512-internal.h"
+
+void sha512_final (SHA512Schedule *ctx, char *digest)
+{
+ register unsigned int i = 0 ;
+ register unsigned int pad = ctx->len % 128;
+
+ ctx->buf[pad++] = 0x80 ;
+ if (pad > 112)
+ {
+ byte_zero(ctx->buf + pad, 128 - pad) ;
+ sha512_transform(ctx, ctx->buf) ;
+ pad = 0 ;
+ }
+ byte_zero(ctx + pad, 120 - pad) ;
+ uint64_pack_big((char *)ctx->buf + 120, ctx->len << 3) ;
+ sha512_transform(ctx, ctx->buf) ;
+
+ for (; i < 8 ; i++) uint64_pack_big(digest + (i << 3), ctx->h[i]) ;
+}
diff --git a/src/libstdcrypto/sha512_init.c b/src/libstdcrypto/sha512_init.c
@@ -0,0 +1,9 @@
+/* ISC license. */
+
+#include <skalibs/sha512.h>
+
+void sha512_init (SHA512Schedule *ctx)
+{
+ SHA512Schedule empty = SHA512_INIT() ;
+ *ctx = empty ;
+}
diff --git a/src/libstdcrypto/sha512_transform.c b/src/libstdcrypto/sha512_transform.c
@@ -0,0 +1,93 @@
+/* ISC license. */
+
+#include <skalibs/uint64.h>
+#include <skalibs/sha512.h>
+#include "sha512-internal.h"
+
+static uint64 ror (uint64 n, unsigned int k)
+{
+ return (n >> k) | (n << (64 - k)) ;
+}
+
+#undef Ch
+#undef Maj
+#undef S0
+#undef S1
+#undef R0
+#undef R1
+
+#define Ch(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
+#define Maj(x, y, z) (((x) & (y)) | ((z) & ((x) | (y))))
+#define S0(x) (ror((x), 28) ^ ror((x), 34) ^ ror((x), 39))
+#define S1(x) (ror((x), 14) ^ ror((x), 18) ^ ror((x), 41))
+#define R0(x) (ror((x), 1) ^ ror((x), 8) ^ ((x) >> 7))
+#define R1(x) (ror((x), 19) ^ ror((x), 61) ^ ((x) >> 6))
+
+void sha512_transform (SHA512Schedule *ctx, unsigned char const *block)
+{
+ static uint64 const K[80] =
+ {
+ 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
+ 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
+ 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
+ 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
+ 0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
+ 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
+ 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL,
+ 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
+ 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
+ 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
+ 0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL,
+ 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
+ 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL,
+ 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
+ 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
+ 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
+ 0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL,
+ 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
+ 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL,
+ 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
+ 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
+ 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
+ 0xd192e819d6ef5218ULL, 0xd69906245565a910ULL,
+ 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
+ 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
+ 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
+ 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
+ 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
+ 0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL,
+ 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
+ 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL,
+ 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
+ 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
+ 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
+ 0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
+ 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
+ 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL,
+ 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
+ 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
+ 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
+ } ;
+ uint64 w[80] ;
+ uint64 h[8] ;
+ uint64 t[2] ;
+ register unsigned int i = 0 ;
+
+ for (; i < 16 ; i++) uint64_unpack_big((char const *)block + (i << 3), w + i) ;
+ for (; i < 80; i++) w[i] = R1(w[i-2]) + w[i-7] + R0(w[i-15]) + w[i-16] ;
+ for (i = 0 ; i < 8 ; i++) h[i] = ctx->h[i] ;
+ for (i = 0 ; i < 80 ; i++)
+ {
+ t[0] = h[7] + S1(h[4]) + Ch(h[4], h[5], h[6]) + K[i] + w[i] ;
+ t[1] = S0(h[0]) + Maj(h[0], h[1], h[2]) ;
+ h[7] = h[6] ;
+ h[6] = h[5] ;
+ h[5] = h[4] ;
+ h[4] = h[3] + t[0] ;
+ h[3] = h[2] ;
+ h[2] = h[1] ;
+ h[1] = h[0] ;
+ h[0] = t[0] + t[1] ;
+ }
+ for (i = 0 ; i < 8 ; i++) ctx->h[i] += h[i] ;
+}
diff --git a/src/libstdcrypto/sha512_update.c b/src/libstdcrypto/sha512_update.c
@@ -0,0 +1,24 @@
+/* ISC license. */
+
+#include <skalibs/bytestr.h>
+#include <skalibs/sha512.h>
+#include "sha512-internal.h"
+
+void sha512_update (SHA512Schedule *ctx, char const *buf, unsigned int len)
+{
+ register unsigned int pad = ctx->len & 0x7fu ;
+ ctx->len += len ;
+ if (pad && len >= 128 - pad)
+ {
+ byte_copy(ctx->buf + pad, 128 - pad, buf) ;
+ buf += 128 - pad ; len -= 128 - pad ; pad = 0 ;
+ sha512_transform(ctx, ctx->buf) ;
+ }
+
+ while (len >= 128)
+ {
+ sha512_transform(ctx, (unsigned char const *)buf) ;
+ buf += 128 ; len -= 128 ;
+ }
+ byte_copy(ctx->buf + pad, len, buf) ;
+}
diff --git a/src/libstddjb/buffer_get.c b/src/libstddjb/buffer_get.c
@@ -7,6 +7,6 @@ int buffer_get (buffer *b, char *s, unsigned int len)
{
unsigned int w = 0 ;
register int r = buffer_getall(b, s, len, &w) ;
- return r == -1 ? errno == EPIPE ? (errno = 0, 0) : -1 :
+ return r == -1 ? errno == EPIPE ? (errno = 0, (int)w) : -1 :
!r ? (errno = EWOULDBLOCK, -1) : (int)w ;
}
