Re: [PATCHES] [patch 1/2] Add implementation of SHA256/384/512

[Bruce Momjian]

Patch applied.  Thanks.

---


Marko Kreen wrote:
> This patch adds implementation of SHA2 to pgcrypto.
> New hashes: SHA256, SHA384, SHA512.
> 
> Code from OpenBSD.


-- 
  Bruce Momjian|  http://candle.pha.pa.us
  pgman@candle.pha.pa.us   |  (610) 359-1001
  +  If your life is a hard drive, |  13 Roberts Road
  +  Christ can be your backup.|  Newtown Square, Pennsylvania 19073

---(end of broadcast)---
TIP 3: Have you checked our extensive FAQ?

   http://www.postgresql.org/docs/faq

[PATCHES] [patch 1/2] Add implementation of SHA256/384/512

[Marko Kreen]

This patch adds implementation of SHA2 to pgcrypto.
New hashes: SHA256, SHA384, SHA512.

Code from OpenBSD.


Index: pgsql/contrib/pgcrypto/Makefile
===
*** pgsql.orig/contrib/pgcrypto/Makefile
--- pgsql/contrib/pgcrypto/Makefile
***
*** 6,19 
  INT_CFLAGS = -DRAND_SILLY
  #INT_CFLAGS = -DRAND_DEV=\"/dev/urandom\"
  
! INT_SRCS = md5.c sha1.c internal.c blf.c rijndael.c
  
  OSSL_CFLAGS = -DRAND_OPENSSL
  OSSL_SRCS = openssl.c
  OSSL_TESTS = des 3des cast5
  
  CF_SRCS = $(if $(subst no,,$(with_openssl)), $(OSSL_SRCS), $(INT_SRCS))
! CF_TESTS = $(if $(subst no,,$(with_openssl)), $(OSSL_TESTS))
  CF_CFLAGS = $(if $(subst no,,$(with_openssl)), $(OSSL_CFLAGS), $(INT_CFLAGS))
  
  PG_CPPFLAGS   = $(CF_CFLAGS)
--- 6,20 
  INT_CFLAGS = -DRAND_SILLY
  #INT_CFLAGS = -DRAND_DEV=\"/dev/urandom\"
  
! INT_SRCS = md5.c sha1.c sha2.c internal.c blf.c rijndael.c
! INT_TESTS = sha2
  
  OSSL_CFLAGS = -DRAND_OPENSSL
  OSSL_SRCS = openssl.c
  OSSL_TESTS = des 3des cast5
  
  CF_SRCS = $(if $(subst no,,$(with_openssl)), $(OSSL_SRCS), $(INT_SRCS))
! CF_TESTS = $(if $(subst no,,$(with_openssl)), $(OSSL_TESTS), $(INT_TESTS))
  CF_CFLAGS = $(if $(subst no,,$(with_openssl)), $(OSSL_CFLAGS), $(INT_CFLAGS))
  
  PG_CPPFLAGS   = $(CF_CFLAGS)
Index: pgsql/contrib/pgcrypto/internal.c
===
*** pgsql.orig/contrib/pgcrypto/internal.c
--- pgsql/contrib/pgcrypto/internal.c
***
*** 36,41 
--- 36,42 
  
  #include "md5.h"
  #include "sha1.h"
+ #include "sha2.h"
  #include "blf.h"
  #include "rijndael.h"
  
***
*** 56,61 
--- 57,65 
  
  static void init_md5(PX_MD * h);
  static void init_sha1(PX_MD * h);
+ static void init_sha256(PX_MD * h);
+ static void init_sha384(PX_MD * h);
+ static void init_sha512(PX_MD * h);
  
  struct int_digest
  {
*** static const struct int_digest
*** 67,72 
--- 71,79 
  int_digest_list[] = {
{ "md5", init_md5 },
{ "sha1", init_sha1 },
+   { "sha256", init_sha256 },
+   { "sha384", init_sha384 },
+   { "sha512", init_sha512 },
{ NULL, NULL }
  };
  
*** int_sha1_free(PX_MD * h)
*** 164,169 
--- 171,316 
px_free(h);
  }
  
+ /* SHA256 */
+ 
+ static unsigned
+ int_sha256_len(PX_MD * h)
+ {
+   return SHA256_DIGEST_LENGTH;
+ }
+ 
+ static unsigned
+ int_sha256_block_len(PX_MD * h)
+ {
+   return SHA256_BLOCK_LENGTH;
+ }
+ 
+ static void
+ int_sha256_update(PX_MD * h, const uint8 *data, unsigned dlen)
+ {
+   SHA256_CTX   *ctx = (SHA256_CTX *) h->p.ptr;
+ 
+   SHA256_Update(ctx, data, dlen);
+ }
+ 
+ static void
+ int_sha256_reset(PX_MD * h)
+ {
+   SHA256_CTX   *ctx = (SHA256_CTX *) h->p.ptr;
+ 
+   SHA256_Init(ctx);
+ }
+ 
+ static void
+ int_sha256_finish(PX_MD * h, uint8 *dst)
+ {
+   SHA256_CTX   *ctx = (SHA256_CTX *) h->p.ptr;
+ 
+   SHA256_Final(dst, ctx);
+ }
+ 
+ static void
+ int_sha256_free(PX_MD * h)
+ {
+   SHA256_CTX   *ctx = (SHA256_CTX *) h->p.ptr;
+ 
+   px_free(ctx);
+   px_free(h);
+ }
+ /* SHA384 */
+ 
+ static unsigned
+ int_sha384_len(PX_MD * h)
+ {
+   return SHA384_DIGEST_LENGTH;
+ }
+ 
+ static unsigned
+ int_sha384_block_len(PX_MD * h)
+ {
+   return SHA384_BLOCK_LENGTH;
+ }
+ 
+ static void
+ int_sha384_update(PX_MD * h, const uint8 *data, unsigned dlen)
+ {
+   SHA384_CTX   *ctx = (SHA384_CTX *) h->p.ptr;
+ 
+   SHA384_Update(ctx, data, dlen);
+ }
+ 
+ static void
+ int_sha384_reset(PX_MD * h)
+ {
+   SHA384_CTX   *ctx = (SHA384_CTX *) h->p.ptr;
+ 
+   SHA384_Init(ctx);
+ }
+ 
+ static void
+ int_sha384_finish(PX_MD * h, uint8 *dst)
+ {
+   SHA384_CTX   *ctx = (SHA384_CTX *) h->p.ptr;
+ 
+   SHA384_Final(dst, ctx);
+ }
+ 
+ static void
+ int_sha384_free(PX_MD * h)
+ {
+   SHA384_CTX   *ctx = (SHA384_CTX *) h->p.ptr;
+ 
+   px_free(ctx);
+   px_free(h);
+ }
+ 
+ /* SHA512 */
+ 
+ static unsigned
+ int_sha512_len(PX_MD * h)
+ {
+   return SHA512_DIGEST_LENGTH;
+ }
+ 
+ static unsigned
+ int_sha512_block_len(PX_MD * h)
+ {
+   return SHA512_BLOCK_LENGTH;
+ }
+ 
+ static void
+ int_sha512_update(PX_MD * h, const uint8 *data, unsigned dlen)
+ {
+   SHA512_CTX   *ctx = (SHA512_CTX *) h->p.ptr;
+ 
+   SHA512_Update(ctx, data, dlen);
+ }
+ 
+ static void
+ int_sha512_reset(PX_MD * h)
+ {
+   SHA512_CTX   *ctx = (SHA512_CTX *) h->p.ptr;
+ 
+   SHA512_Init(ctx);
+ }
+ 
+ static void
+ int_sha512_finish(PX_MD * h, uint8 *dst)
+ {
+   SHA512_CTX   *ctx = (SHA512_CTX *) h->p.ptr;
+ 
+   SHA512_Final(dst, ctx);
+ }
+ 
+ static void
+ int_sha512_free(PX_MD * h)
+ {
+   SHA512_CTX   *ctx = (SHA512_CTX *) h->p.ptr;
+ 
+   px_free(ctx);
+   px_free(h);
+ }
+ 
  /* init functions */
  
  static void
*** init_sha1(PX_MD * md)
*** 204,209 
--- 351,413 
md->reset(md);
  }
  
+ static v