X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=crypt.h;h=9be7a23e6da4d6d1796d4d98da7d8280152c6c2a;hp=833bbf1b87e5d8a34fff91d4558820ee33191d27;hb=33e57c3a92e4c105504832b4bb106273ffcdc2a7;hpb=63aab30b55d5809704a2d0e1c4e8de20e8228d7d

diff --git a/crypt.h b/crypt.h
index 833bbf1b..9be7a23e 100644
--- a/crypt.h
+++ b/crypt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -123,88 +123,53 @@ struct stream_cipher_context {
  *
  * \param data The key.
  * \param len The size of the key.
+ * \param use_aes True: Use the aes_ctr128 stream cipher, false: Use RC4.
  *
  * \return A new stream cipher structure.
  */
-struct stream_cipher *sc_new(const unsigned char *data, int len);
+struct stream_cipher *sc_new(const unsigned char *data, int len,
+		bool use_aes);
 
 /**
- * Deallocate a stream cipher structure.
- *
- * \param sc A stream cipher previously obtained by sc_new().
- */
-void sc_free(struct stream_cipher *sc);
-
-/**
- * Encrypt and send a buffer.
+ * Encrypt or decrypt a buffer using a stream cipher.
  *
- * \param scc The context.
- * \param buf The buffer to send.
- * \param len The size of \a buf in bytes.
+ * \param sc Crypto key.
+ * \param src The source buffer and length.
+ * \param dst The destination buffer and length, filled out by the function.
  *
- * \return The return value of the underyling call to write_all().
- *
- * \sa \ref write_all(), RC4(3).
+ * It is up to the implementation to decide whether the crypt operation is
+ * performed in place. The caller can tell by looking if the buffers given by
+ * \a src and \a dst coincide after the call. If (and only if) the crypt
+ * operation was not performed in place, the function allocated a new buffer
+ * for the result, so dst->iov_base is different from src->iov_base. In this
+ * case, the destination buffer must be freed by the caller when it is no
+ * longer needed.
  */
-int sc_send_bin_buffer(struct stream_cipher_context *scc, char *buf,
-		size_t len);
+void sc_crypt(struct stream_cipher *sc, struct iovec *src, struct iovec *dst);
 
 /**
- * Encrypt and send a \p NULL-terminated buffer.
- *
- * \param scc The context.
- * \param buf The buffer to send.
- *
- * \return The return value of the underyling call to sc_send_bin_buffer().
- */
-int sc_send_buffer(struct stream_cipher_context *scc, char *buf);
-
-/**
- * Format, encrypt and send a buffer.
- *
- * \param scc The context.
- * \param fmt A format string.
+ * Wrapper for \ref sc_crypt() that can be used as a sideband transformation.
  *
- * \return The return value of the underyling call to sc_send_buffer().
+ * \param src Passed verbatim to \ref sc_crypt().
+ * \param dst Passed verbatim to \ref sc_crypt().
+ * \param trafo_context Must point to an initialized stream cipher.
  */
-__printf_2_3 int sc_send_va_buffer(struct stream_cipher_context *scc,
-		const char *fmt, ...);
+_static_inline_ void sc_trafo(struct iovec *src, struct iovec *dst,
+		void *trafo_context)
+{
+	sc_crypt(trafo_context, src, dst);
+}
 
 /**
- * Receive a buffer and decrypt it.
- *
- * \param scc The context.
- * \param buf The buffer to write the decrypted data to.
- * \param size The size of \a buf.
- *
- * \return The number of bytes received on success, negative on errors, zero if
- * the peer has performed an orderly shutdown.
- *
- * \sa recv(2), RC4(3).
- */
-int sc_recv_bin_buffer(struct stream_cipher_context *scc, char *buf,
-		size_t size);
-
-/**
- * Receive a buffer, decrypt it and write terminating NULL byte.
- *
- * \param scc The context.
- * \param buf The buffer to write the decrypted data to.
- * \param size The size of \a buf.
- *
- * Read at most \a size - 1 bytes from file descriptor given by \a scc, decrypt
- * the received data and write a NULL byte at the end of the decrypted data.
+ * Deallocate a stream cipher structure.
  *
- * \return The return value of the underlying call to \ref
- * sc_recv_bin_buffer().
+ * \param sc A stream cipher previously obtained by sc_new().
  */
-int sc_recv_buffer(struct stream_cipher_context *scc, char *buf, size_t size);
-
+void sc_free(struct stream_cipher *sc);
 
 /** Size of the hash value in bytes. */
 #define HASH_SIZE 20
 
-
 /**
  * Compute the hash of the given input data.
  *