X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=crypt_common.c;h=705c7249903e2f4e998043e2a483029c43596809;hp=8fac0dc71ed37a7dff633a2891d4ada1a0c0376b;hb=2830b9f881898aaec073d5ba19e33482e30190bd;hpb=7bf235513ca87b608bdddf6220e284213965e130

diff --git a/crypt_common.c b/crypt_common.c
index 8fac0dc7..705c7249 100644
--- a/crypt_common.c
+++ b/crypt_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,13 +7,12 @@
 /** \file crypt_common.c Crypto functions independent of openssl/libgcrypt. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
 #include "string.h"
-#include "crypt_backend.h"
 #include "crypt.h"
+#include "crypt_backend.h"
 
 /** If the key begins with this text, we treat it as an ssh key. */
 #define KEY_TYPE_TXT "ssh-rsa"
@@ -86,7 +85,7 @@ int base64_decode(char const *src, unsigned char *target, size_t targsize)
 			break;
 
 		pos = strchr(Base64, ch);
-		if (pos == 0) /* A non-base64 character. */
+		if (pos == NULL) /* A non-base64 character. */
 			return -E_BASE64;
 
 		switch (state) {
@@ -338,7 +337,12 @@ int sc_recv_buffer(struct stream_cipher_context *scc, char *buf, size_t size)
 
 int sc_send_buffer(struct stream_cipher_context *scc, char *buf)
 {
-	return sc_send_bin_buffer(scc, buf, strlen(buf));
+	size_t len = strlen(buf);
+	int ret = sc_send_bin_buffer(scc, buf, len);
+
+	if (ret < 0 || ret == len)
+		return ret;
+	return -E_SHORT_WRITE;
 }
 
 __printf_2_3 int sc_send_va_buffer(struct stream_cipher_context *scc,
@@ -346,9 +350,12 @@ __printf_2_3 int sc_send_va_buffer(struct stream_cipher_context *scc,
 {
 	char *msg;
 	int ret;
+	va_list ap;
 
-	PARA_VSPRINTF(fmt, msg);
-	ret = sc_send_buffer(scc, msg);
+	va_start(ap, fmt);
+	ret = xvasprintf(&msg, fmt, ap);
+	va_end(ap);
+	ret = sc_send_bin_buffer(scc, msg, ret);
 	free(msg);
 	return ret;
 }