X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=crypt_common.c;h=71aabf53f944eea64d4214fccff354787b7e6f9b;hp=8fac0dc71ed37a7dff633a2891d4ada1a0c0376b;hb=eb8ac00d795be355154f237d7e29f8ecf9999846;hpb=4990334538fe7f18964a6027b22d47c7640c3ec0

diff --git a/crypt_common.c b/crypt_common.c
index 8fac0dc7..71aabf53 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-2014 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) {
@@ -322,33 +321,3 @@ int hash_compare(unsigned char *h1, unsigned char *h2)
 	}
 	return 0;
 }
-
-int sc_recv_buffer(struct stream_cipher_context *scc, char *buf, size_t size)
-{
-	int n;
-
-	assert(size);
-	n = sc_recv_bin_buffer(scc, buf, size - 1);
-	if (n >= 0)
-		buf[n] = '\0';
-	else
-		*buf = '\0';
-	return n;
-}
-
-int sc_send_buffer(struct stream_cipher_context *scc, char *buf)
-{
-	return sc_send_bin_buffer(scc, buf, strlen(buf));
-}
-
-__printf_2_3 int sc_send_va_buffer(struct stream_cipher_context *scc,
-		const char *fmt, ...)
-{
-	char *msg;
-	int ret;
-
-	PARA_VSPRINTF(fmt, msg);
-	ret = sc_send_buffer(scc, msg);
-	free(msg);
-	return ret;
-}