Changeset 5529:d86f148f08b2 in roaraudio

Timestamp:

06/12/12 09:18:12 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Implemented SHA1 support (Closes: #232)

Files:

• AUTHORS (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• include/libroar/hash.h (modified) (1 diff)
• libroar/Makefile (modified) (1 diff)
• libroar/hash.c (modified) (2 diffs)
• libroar/hash_sha1.c (added)

AUTHORS

@@ -4 +4 @@
 
 --- Maintainer:
+archlinux: Hans-Kristian Arntzen <maister@archlinux.us>
+OpenBSD  : janus
+
+--- Old Maintainers:
 archlinux: kalasmannen <kalasmannen@gmail.com>
-OpenBSD  : janus
 
 --- Code contributors ---
@@ -24 +27 @@
   2550 Garcia Avenue
   Mountain View, California  94043
+
+--- Crypto Layer:
+* Steve Reid <steve@edmweb.com>
 
 --- gstreamer code:

ChangeLog

@@ -1 +1 @@
 v. 1.0beta3 - ?
         * Try use-execed workaround also on UNIX Domain Sockets (Closes: #207)
+        * Implemented SHA1 support (Closes: #232)
 
 v. 1.0beta2 - Wed Jun 06 2012 19:56 CEST

include/libroar/hash.h

@@ -109 +109 @@
 int roar_hash_salted_buffer(void * digest, const void * data, size_t datalen, roar_hash_t algo, const void * salt, size_t saltlen);
 
+
+// 'forwardings' for hashes without own header:
+struct roar_hash_sha1 {
+ uint32_t state[5];
+ uint64_t count;
+ size_t in_buffer;
+ char buffer[64];
+ int is_final;
+};
+
 #endif
 

libroar/Makefile

@@ -8 +8 @@
 VIO_BRIDGE=vio_bio.o vio_stdio.o
 VIO=$(VIO_META) $(VIO_BRIDGE) vio_cmd.o vio_magic.o vio_pipe.o vio_socket.o vio_winsock.o vio_stack.o vio_jumbo.o vio_proto.o vio_dstr.o vio_tantalos.o vio_rtp.o vio_buffer.o vio_buffer_store.o vio_stdvios.o vio_misc.o vio_zlib.o vio_stream.o vio_proxy.o
-HASHES=hash.o hash_tiger.o
+HASHES=hash.o hash_tiger.o hash_sha1.o
 PASSWORD=passwordapi.o pinentry.o sshaskpass.o
 CRYPTO=crypto.o random.o $(HASHES) crc.o

libroar/hash.c

@@ -92 +92 @@
 };
 
+int roar_hash_sha1_init(void * state);
+int roar_hash_sha1_uninit(void * state);
+int roar_hash_sha1_digest(void * state, void * digest, size_t * len);
+int roar_hash_sha1_proc_block(void * state, const void * block);
+int roar_hash_sha1_proc(void * state, const void * data, size_t len);
+
 static struct roar_hash_cmds _libroar_hash_cmds[] = {
  {ROAR_HT_TIGER, sizeof(struct roar_hash_tiger), 512,
@@ -107 +113 @@
   roar_hash_adler32_digest, NULL, roar_hash_adler32_proc
  },
+ {ROAR_HT_SHA1, sizeof(struct roar_hash_sha1), 64,
+  roar_hash_sha1_init, roar_hash_sha1_uninit,
+  roar_hash_sha1_digest, roar_hash_sha1_proc_block, roar_hash_sha1_proc},
  {-1, -1, -1, NULL, NULL, NULL, NULL, NULL}
 };