cleanup: generalize my_sha1.cc

move most of the code into my_sha.ic, making it independent
from the actual SHAx variant.

2 files changed, 189 insertions, 133 deletions

diff --git a/mysys_ssl/my_sha.ic b/mysys_ssl/my_sha.ic
new file mode 100644
index 00000000000..5a95c9c4682
--- /dev/null
+++ b/mysys_ssl/my_sha.ic
@@ -0,0 +1,186 @@
+/* Copyright (c) 2012, Oracle and/or its affiliates.
+   Copyright (c) 2014, 2017, MariaDB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
+
+/**
+  @file
+
+  @brief
+  Wrapper functions for OpenSSL, YaSSL implementations. Also provides a
+  Compatibility layer to make available YaSSL's SHAn implementation.
+*/
+
+#include <my_global.h>
+#include <stdarg.h>
+
+#define HASH_SIZE 20
+
+#if defined(HAVE_YASSL)
+#include "sha.hpp"
+
+#define xCONTEXT(x)     TaoCrypt::SHA ## x
+#define yCONTEXT(y)     xCONTEXT(y)
+#define CONTEXT         yCONTEXT(NUM)
+#define SHA1            SHA
+
+static void sha_init(CONTEXT *context)
+{
+  context->Init();
+}
+
+/*
+  this is a variant of sha_init to be used in this file only.
+  does nothing for yassl, because the context's constructor was called automatically.
+*/
+static void sha_init_fast(CONTEXT *context)
+{
+}
+
+static void sha_input(CONTEXT *context, const uchar *buf, unsigned len)
+{
+  context->Update((const TaoCrypt::byte *) buf, len);
+}
+
+static void sha_result(CONTEXT *context, uchar digest[HASH_SIZE])
+{
+    context->Final((TaoCrypt::byte *) digest);
+}
+
+#elif defined(HAVE_OPENSSL)
+#include <openssl/sha.h>
+
+#define xCONTEXT(x)     SHA ## x ## _CTX
+#define yCONTEXT(y)     xCONTEXT(y)
+#define CONTEXT         yCONTEXT(NUM)
+#define SHA1_CTX        SHA_CTX
+
+#define xSHA_Init(x)    SHA ## x ## _Init
+#define xSHA_Update(x)  SHA ## x ## _Update
+#define xSHA_Final(x)   SHA ## x ## _Final
+#define ySHA_Init(y)    xSHA_Init(y)
+#define ySHA_Update(y)  xSHA_Update(y)
+#define ySHA_Final(y)   xSHA_Final(y)
+#define SHA_Init        ySHA_Init(NUM)
+#define SHA_Update      ySHA_Update(NUM)
+#define SHA_Final       ySHA_Final(NUM)
+
+static void sha_init(CONTEXT *context)
+{
+  SHA_Init(context);
+}
+
+static void sha_init_fast(CONTEXT *context)
+{
+  sha_init(context);
+}
+
+static void sha_input(CONTEXT *context, const uchar *buf, unsigned len)
+{
+  SHA_Update(context, buf, len);
+}
+
+static void sha_result(CONTEXT *context, uchar digest[HASH_SIZE])
+{
+  SHA_Final(digest, context);
+}
+
+#endif /* HAVE_YASSL */
+
+#define xmy_sha_multi(x)         my_sha ## x ## _multi
+#define xmy_sha_context_size(x)  my_sha ## x ## _context_size
+#define xmy_sha_init(x)          my_sha ## x ## _init
+#define xmy_sha_input(x)         my_sha ## x ## _input
+#define xmy_sha_result(x)        my_sha ## x ## _result
+#define xmy_sha(x)               my_sha ## x
+#define ymy_sha_multi(y)         xmy_sha_multi(y)
+#define ymy_sha_context_size(y)  xmy_sha_context_size(y)
+#define ymy_sha_init(y)          xmy_sha_init(y)
+#define ymy_sha_input(y)         xmy_sha_input(y)
+#define ymy_sha_result(y)        xmy_sha_result(y)
+#define ymy_sha(y)               xmy_sha(y)
+#define my_sha_multi             ymy_sha_multi(NUM)
+#define my_sha_context_size      ymy_sha_context_size(NUM)
+#define my_sha_init              ymy_sha_init(NUM)
+#define my_sha_input             ymy_sha_input(NUM)
+#define my_sha_result            ymy_sha_result(NUM)
+#define my_sha                   ymy_sha(NUM)
+
+/**
+  Wrapper function to compute SHAn message digest.
+
+  @param digest [out]  Computed SHAn digest
+  @param buf    [in]   Message to be computed
+  @param len    [in]   Length of the message
+
+  @return              void
+*/
+void my_sha(uchar *digest, const char *buf, size_t len)
+{
+  CONTEXT context;
+
+  sha_init_fast(&context);
+  sha_input(&context, (const uchar *)buf, len);
+  sha_result(&context, digest);
+}
+
+
+/**
+  Wrapper function to compute SHAn message digest for
+  two messages in order to emulate shaN(msg1, msg2).
+
+  @param digest [out]  Computed SHAn digest
+  @param buf1   [in]   First message
+  @param len1   [in]   Length of first message
+  @param buf2   [in]   Second message
+  @param len2   [in]   Length of second message
+
+  @return              void
+*/
+void my_sha_multi(uchar *digest, ...)
+{
+  va_list args;
+  va_start(args, digest);
+
+  CONTEXT context;
+  const uchar *str;
+
+  sha_init_fast(&context);
+  for (str= va_arg(args, const uchar*); str; str= va_arg(args, const uchar*))
+    sha_input(&context, str, va_arg(args, size_t));
+
+  sha_result(&context, digest);
+  va_end(args);
+}
+
+size_t my_sha_context_size()
+{
+  return sizeof(CONTEXT);
+}
+
+void my_sha_init(void *context)
+{
+  sha_init((CONTEXT *)context);
+}
+
+void my_sha_input(void *context, const uchar *buf, size_t len)
+{
+  sha_input((CONTEXT *)context, buf, len);
+}
+
+void my_sha_result(void *context, uchar *digest)
+{
+  sha_result((CONTEXT *)context, digest);
+}
diff --git a/mysys_ssl/my_sha1.cc b/mysys_ssl/my_sha1.cc
index 9b12d1f1ae8..dc6a7a46179 100644
--- a/mysys_ssl/my_sha1.cc
+++ b/mysys_ssl/my_sha1.cc
@@ -1,5 +1,4 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates.
-   Copyright (c) 2014, SkySQL Ab.
+/* Copyright (c) 2017, MariaDB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,135 +13,6 @@
    along with this program; if not, write to the Free Software Foundation,
    51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
+#define NUM 1
 
-/**
-  @file
-
-  @brief
-  Wrapper functions for OpenSSL, YaSSL implementations. Also provides a
-  Compatibility layer to make available YaSSL's SHA1 implementation.
-*/
-
-#include <my_global.h>
-#include <sha1.h>
-#include <stdarg.h>
-
-#if defined(HAVE_YASSL)
-#include "sha.hpp"
-
-typedef TaoCrypt::SHA SHA_CTX;
-
-static void sha1_init(SHA_CTX *context)
-{
-  context->Init();
-}
-
-/*
-  this is a variant of sha1_init to be used in this file only.
-  does nothing for yassl, because the context's constructor was called automatically.
-*/
-static void sha1_init_fast(SHA_CTX *context)
-{
-}
-
-static void sha1_input(SHA_CTX *context, const uchar *buf, unsigned len)
-{
-  context->Update((const TaoCrypt::byte *) buf, len);
-}
-
-static void sha1_result(SHA_CTX *context, uchar digest[SHA1_HASH_SIZE])
-{
-    context->Final((TaoCrypt::byte *) digest);
-}
-
-#elif defined(HAVE_OPENSSL)
-#include <openssl/sha.h>
-
-static void sha1_init(SHA_CTX *context)
-{
-  SHA1_Init(context);
-}
-
-static void sha1_init_fast(SHA_CTX *context)
-{
-  sha1_init(context);
-}
-
-static void sha1_input(SHA_CTX *context, const uchar *buf, unsigned len)
-{
-  SHA1_Update(context, buf, len);
-}
-
-static void sha1_result(SHA_CTX *context, uchar digest[SHA1_HASH_SIZE])
-{
-  SHA1_Final(digest, context);
-}
-
-#endif /* HAVE_YASSL */
-
-/**
-  Wrapper function to compute SHA1 message digest.
-
-  @param digest [out]  Computed SHA1 digest
-  @param buf    [in]   Message to be computed
-  @param len    [in]   Length of the message
-
-  @return              void
-*/
-void my_sha1(uchar *digest, const char *buf, size_t len)
-{
-  SHA_CTX sha1_context;
-
-  sha1_init_fast(&sha1_context);
-  sha1_input(&sha1_context, (const uchar *)buf, len);
-  sha1_result(&sha1_context, digest);
-}
-
-
-/**
-  Wrapper function to compute SHA1 message digest for
-  two messages in order to emulate sha1(msg1, msg2).
-
-  @param digest [out]  Computed SHA1 digest
-  @param buf1   [in]   First message
-  @param len1   [in]   Length of first message
-  @param buf2   [in]   Second message
-  @param len2   [in]   Length of second message
-
-  @return              void
-*/
-void my_sha1_multi(uchar *digest, ...)
-{
-  va_list args;
-  va_start(args, digest);
-
-  SHA_CTX sha1_context;
-  const uchar *str;
-
-  sha1_init_fast(&sha1_context);
-  for (str= va_arg(args, const uchar*); str; str= va_arg(args, const uchar*))
-    sha1_input(&sha1_context, str, va_arg(args, size_t));
-
-  sha1_result(&sha1_context, digest);
-  va_end(args);
-}
-
-size_t my_sha1_context_size()
-{
-  return sizeof(SHA_CTX);
-}
-
-void my_sha1_init(void *context)
-{
-  sha1_init((SHA_CTX *)context);
-}
-
-void my_sha1_input(void *context, const uchar *buf, size_t len)
-{
-  sha1_input((SHA_CTX *)context, buf, len);
-}
-
-void my_sha1_result(void *context, uchar *digest)
-{
-  sha1_result((SHA_CTX *)context, digest);
-}
+#include "my_sha.ic"