Move CLI_AUTH_RESPONSE_LEN define to cli.h, exclude terminating NUL.

varnish · Jun 6, 2011 · 332c520 · 332c520
1 parent a39be7a
commit 332c520
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
@@ -88,7 +88,7 @@ cli_sock(const char *T_arg, const char *S_arg)
 	int sock;
 	unsigned status;
 	char *answer = NULL;
-	char buf[CLI_AUTH_RESPONSE_LEN];
+	char buf[CLI_AUTH_RESPONSE_LEN + 1];
 
 	sock = VSS_open(T_arg, timeout);
 	if (sock < 0) {

diff --git a/bin/varnishd/mgt_cli.c b/bin/varnishd/mgt_cli.c
@@ -275,7 +275,7 @@ static void
 mcf_auth(struct cli *cli, const char *const *av, void *priv)
 {
 	int fd;
-	char buf[CLI_AUTH_RESPONSE_LEN];
+	char buf[CLI_AUTH_RESPONSE_LEN + 1];
 
 	AN(av[2]);
 	(void)priv;

diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
@@ -339,7 +339,7 @@ varnish_launch(struct varnish *v)
 	nfd = open(abuf, O_RDONLY);
 	assert(nfd >= 0);
 
-	assert(sizeof abuf >= CLI_AUTH_RESPONSE_LEN + 6);
+	assert(sizeof abuf >= CLI_AUTH_RESPONSE_LEN + 7);
 	strcpy(abuf, "auth ");
 	VCLI_AuthResponse(nfd, r, abuf + 5);
 	AZ(close(nfd));

diff --git a/include/cli.h b/include/cli.h
@@ -206,3 +206,5 @@ enum VCLI_status_e {
 
 /* Length of first line of response */
 #define CLI_LINE0_LEN	13
+#define CLI_AUTH_RESPONSE_LEN		64	/* 64 hex + NUL */
+
diff --git a/include/cli_common.h b/include/cli_common.h
@@ -47,7 +47,5 @@ struct cli {
 int VCLI_WriteResult(int fd, const struct cli *cli);
 int VCLI_ReadResult(int fd, unsigned *status, char **ptr, double tmo);
 
-#define CLI_AUTH_RESPONSE_LEN		65	/* 64 hex + NUL */
-
 void VCLI_AuthResponse(int S_fd, const char *challenge,
-    char reponse[CLI_AUTH_RESPONSE_LEN]);
+    char reponse[CLI_AUTH_RESPONSE_LEN + 1]);
diff --git a/lib/libvarnish/cli_auth.c b/lib/libvarnish/cli_auth.c
@@ -40,13 +40,13 @@
 
 void
 VCLI_AuthResponse(int S_fd, const char *challenge,
-    char response[CLI_AUTH_RESPONSE_LEN])
+    char response[CLI_AUTH_RESPONSE_LEN + 1])
 {
 	SHA256_CTX ctx;
 	uint8_t buf[BUFSIZ];
 	int i;
 
-	assert(CLI_AUTH_RESPONSE_LEN == (SHA256_LEN * 2 + 1));
+	assert(CLI_AUTH_RESPONSE_LEN == (SHA256_LEN * 2));
 
 	SHA256_Init(&ctx);
 	SHA256_Update(&ctx, challenge, 32);