svn commit: r349000 - head/sys/geom/eli

[Mariusz Zaborski]

Author: oshogbo
Date: Wed Jun 12 19:29:12 2019
New Revision: 349000
URL: https://svnweb.freebsd.org/changeset/base/349000

Log:
  geli: partially revert r348709
  
  Let's change the unsigned arguments to the signed one, but let's don't
  change pointers to the array notation.
  
  Requested by:	pjd

Modified:
  head/sys/geom/eli/g_eli.h
  head/sys/geom/eli/g_eli_hmac.c
  head/sys/geom/eli/pkcs5v2.c
  head/sys/geom/eli/pkcs5v2.h

Modified: head/sys/geom/eli/g_eli.h
==============================================================================
--- head/sys/geom/eli/g_eli.h	Wed Jun 12 18:07:04 2019	(r348999)
+++ head/sys/geom/eli/g_eli.h	Wed Jun 12 19:29:12 2019	(r349000)
@@ -721,12 +721,12 @@ struct hmac_ctx {
 	SHA512_CTX	outerctx;
 };
 
-void g_eli_crypto_hmac_init(struct hmac_ctx *ctx, const char hkey[],
+void g_eli_crypto_hmac_init(struct hmac_ctx *ctx, const char *hkey,
     size_t hkeylen);
 void g_eli_crypto_hmac_update(struct hmac_ctx *ctx, const uint8_t *data,
     size_t datasize);
 void g_eli_crypto_hmac_final(struct hmac_ctx *ctx, uint8_t *md, size_t mdsize);
-void g_eli_crypto_hmac(const char hkey[], size_t hkeysize,
+void g_eli_crypto_hmac(const char *hkey, size_t hkeysize,
     const uint8_t *data, size_t datasize, uint8_t *md, size_t mdsize);
 
 void g_eli_key_fill(struct g_eli_softc *sc, struct g_eli_key *key,

Modified: head/sys/geom/eli/g_eli_hmac.c
==============================================================================
--- head/sys/geom/eli/g_eli_hmac.c	Wed Jun 12 18:07:04 2019	(r348999)
+++ head/sys/geom/eli/g_eli_hmac.c	Wed Jun 12 19:29:12 2019	(r349000)
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <geom/eli/g_eli.h>
 
 void
-g_eli_crypto_hmac_init(struct hmac_ctx *ctx, const char hkey[],
+g_eli_crypto_hmac_init(struct hmac_ctx *ctx, const char *hkey,
     size_t hkeylen)
 {
 	u_char k_ipad[128], k_opad[128], key[128];
@@ -110,7 +110,7 @@ g_eli_crypto_hmac_final(struct hmac_ctx *ctx, uint8_t 
 }
 
 void
-g_eli_crypto_hmac(const char hkey[], size_t hkeysize, const uint8_t *data,
+g_eli_crypto_hmac(const char *hkey, size_t hkeysize, const uint8_t *data,
     size_t datasize, uint8_t *md, size_t mdsize)
 {
 	struct hmac_ctx ctx;

Modified: head/sys/geom/eli/pkcs5v2.c
==============================================================================
--- head/sys/geom/eli/pkcs5v2.c	Wed Jun 12 18:07:04 2019	(r348999)
+++ head/sys/geom/eli/pkcs5v2.c	Wed Jun 12 19:29:12 2019	(r349000)
@@ -52,7 +52,7 @@ xor(uint8_t *dst, const uint8_t *src, size_t size)
 
 void
 pkcs5v2_genkey(uint8_t *key, unsigned keylen, const uint8_t *salt,
-    size_t saltsize, const char passphrase[], u_int iterations)
+    size_t saltsize, const char *passphrase, u_int iterations)
 {
 	uint8_t md[SHA512_MDLEN], saltcount[saltsize + sizeof(uint32_t)];
 	uint8_t *counter, *keyp;

Modified: head/sys/geom/eli/pkcs5v2.h
==============================================================================
--- head/sys/geom/eli/pkcs5v2.h	Wed Jun 12 18:07:04 2019	(r348999)
+++ head/sys/geom/eli/pkcs5v2.h	Wed Jun 12 19:29:12 2019	(r349000)
@@ -31,7 +31,7 @@
 #ifndef _PKCS5V2_H_
 #define	_PKCS5V2_H_
 void pkcs5v2_genkey(uint8_t *key, unsigned keylen, const uint8_t *salt,
-    size_t saltsize, const char passphrase[], u_int iterations);
+    size_t saltsize, const char *passphrase, u_int iterations);
 #ifndef _KERNEL
 int pkcs5v2_calculate(int usecs);
 #endif