summaryrefslogtreecommitdiff
path: root/src/libstdcrypto
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-03-13 22:43:45 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-03-13 22:43:45 +0000
commit33dfbbeaec4a49e110f51f5d088015f1a8fb9075 (patch)
tree7f2e2359d05b63b1b0b59b61ae3fc154050fc486 /src/libstdcrypto
parente450f6efc39e55e32264d2daded6c757af0f7527 (diff)
downloadskalibs-33dfbbeaec4a49e110f51f5d088015f1a8fb9075.tar.xz
More superflous headers cleanup and tiny fixes
Diffstat (limited to 'src/libstdcrypto')
-rw-r--r--src/libstdcrypto/md5_final.c15
-rw-r--r--src/libstdcrypto/md5_transform.c1
-rw-r--r--src/libstdcrypto/md5_update.c14
-rw-r--r--src/libstdcrypto/rc4.c1
-rw-r--r--src/libstdcrypto/sha1_transform.c1
-rw-r--r--src/libstdcrypto/sha1_update.c1
-rw-r--r--src/libstdcrypto/sha256_transform.c1
-rw-r--r--src/libstdcrypto/sha256_update.c1
8 files changed, 13 insertions, 22 deletions
diff --git a/src/libstdcrypto/md5_final.c b/src/libstdcrypto/md5_final.c
index 706162b..72d6529 100644
--- a/src/libstdcrypto/md5_final.c
+++ b/src/libstdcrypto/md5_final.c
@@ -1,8 +1,7 @@
/* ISC license. */
-#include <stdint.h>
+#include <string.h>
#include <skalibs/uint32.h>
-#include <skalibs/bytestr.h>
#include <skalibs/md5.h>
#include "md5-internal.h"
@@ -14,18 +13,18 @@ void md5_final (MD5Schedule *ctx, char *digest /* 16 chars */)
count = 63 - count ;
if (count < 8)
{
- byte_zero(p, count) ;
+ memset(p, 0, count) ;
uint32_little_endian((char *)ctx->in, 16) ;
md5_transform(ctx->buf, (uint32_t *)ctx->in) ;
- byte_zero(ctx->in, 56) ;
+ memset(ctx->in, 0, 56) ;
}
- else byte_zero(p, count - 8) ;
+ else memset(p, 0, count - 8) ;
uint32_little_endian((char *)ctx->in, 14) ;
- byte_copy((char *)ctx->in + 56, 4, (char *)&ctx->bits[0]) ;
- byte_copy((char *)ctx->in + 60, 4, (char *)&ctx->bits[1]) ;
+ memcpy(ctx->in + 56, &ctx->bits[0], 4) ;
+ memcpy(ctx->in + 60, &ctx->bits[1], 4) ;
md5_transform(ctx->buf, (uint32_t *)ctx->in) ;
uint32_little_endian((char *)ctx->buf, 4) ;
- byte_copy(digest, 16, (char *)ctx->buf) ;
+ memcpy(digest, ctx->buf, 16) ;
}
diff --git a/src/libstdcrypto/md5_transform.c b/src/libstdcrypto/md5_transform.c
index e210e73..90be9ab 100644
--- a/src/libstdcrypto/md5_transform.c
+++ b/src/libstdcrypto/md5_transform.c
@@ -1,6 +1,5 @@
/* ISC license. */
-#include <stdint.h>
#include "md5-internal.h"
/* #define F1(x, y, z) (x & y | ~x & z) */
diff --git a/src/libstdcrypto/md5_update.c b/src/libstdcrypto/md5_update.c
index 1a88540..d61cd3f 100644
--- a/src/libstdcrypto/md5_update.c
+++ b/src/libstdcrypto/md5_update.c
@@ -1,15 +1,13 @@
/* ISC license. */
-#include <sys/types.h>
-#include <stdint.h>
+#include <string.h>
#include <skalibs/uint32.h>
-#include <skalibs/bytestr.h>
#include <skalibs/md5.h>
#include "md5-internal.h"
void md5_update (MD5Schedule *ctx, char const *s, size_t len)
{
- uint32 t = ctx->bits[0] ;
+ uint32_t t = ctx->bits[0] ;
if ((ctx->bits[0] = t + (len << 3)) < t)
ctx->bits[1]++ ;
ctx->bits[1] += len >> 29 ;
@@ -20,20 +18,20 @@ void md5_update (MD5Schedule *ctx, char const *s, size_t len)
t = 64 - t ;
if (len < t)
{
- byte_copy((char *)p, len, s) ;
+ memcpy(p, s, len) ;
return ;
}
- byte_copy((char *)p, t, s) ;
+ memcpy(p, s, t) ;
uint32_little_endian((char *)ctx->in, 16) ;
md5_transform(ctx->buf, (uint32_t *)ctx->in) ;
s += t ; len -= t ;
}
while (len >= 64)
{
- byte_copy((char *)ctx->in, 64, s) ;
+ memcpy(ctx->in, s, 64) ;
uint32_little_endian((char *)ctx->in, 16) ;
md5_transform(ctx->buf, (uint32_t *)ctx->in) ;
s += 64 ; len -= 64 ;
}
- byte_copy((char *)ctx->in, len, s) ;
+ memcpy(ctx->in, s, len) ;
}
diff --git a/src/libstdcrypto/rc4.c b/src/libstdcrypto/rc4.c
index 2f39b95..482c31a 100644
--- a/src/libstdcrypto/rc4.c
+++ b/src/libstdcrypto/rc4.c
@@ -1,7 +1,6 @@
/* ISC license. */
/* Thanks to Thomas Pornin <pornin@bolet.org> */
-#include <sys/types.h>
#include <skalibs/bytestr.h>
#include <skalibs/rc4.h>
diff --git a/src/libstdcrypto/sha1_transform.c b/src/libstdcrypto/sha1_transform.c
index 66a1c52..c323c66 100644
--- a/src/libstdcrypto/sha1_transform.c
+++ b/src/libstdcrypto/sha1_transform.c
@@ -1,6 +1,5 @@
/* ISC license. */
-#include <stdint.h>
#include "sha1-internal.h"
#define F1(x, y, z) ((x & y) | ((~x) & z))
diff --git a/src/libstdcrypto/sha1_update.c b/src/libstdcrypto/sha1_update.c
index 4fa393c..a35ca8f 100644
--- a/src/libstdcrypto/sha1_update.c
+++ b/src/libstdcrypto/sha1_update.c
@@ -1,6 +1,5 @@
/* ISC license. */
-#include <sys/types.h>
#include <skalibs/sha1.h>
#include "sha1-internal.h"
diff --git a/src/libstdcrypto/sha256_transform.c b/src/libstdcrypto/sha256_transform.c
index 65a51c4..3e6a319 100644
--- a/src/libstdcrypto/sha256_transform.c
+++ b/src/libstdcrypto/sha256_transform.c
@@ -1,6 +1,5 @@
/* ISC license. */
-#include <stdint.h>
#include "sha256-internal.h"
#define F1(x, y, z) ((x & y) | ((~x) & z))
diff --git a/src/libstdcrypto/sha256_update.c b/src/libstdcrypto/sha256_update.c
index d8bb3b1..70322ee 100644
--- a/src/libstdcrypto/sha256_update.c
+++ b/src/libstdcrypto/sha256_update.c
@@ -1,6 +1,5 @@
/* ISC license. */
-#include <sys/types.h>
#include <skalibs/sha256.h>
#include "sha256-internal.h"