Merge branch '2.3.x'

* 2.3.x:
  symm/hmac-def.h: Fix the NMAC and SSLMAC classes.

Conflicts:
	symm/hmac-def.h

diff --cc symm/hmac-def.h
index e639b8c,893c686..72bd126
--- 1/symm/hmac-def.h
--- 2/symm/hmac-def.h
+++ b/symm/hmac-def.h
@@@ -337,19 -336,17 +337,19 @@@ const gcmac pre##_sslmac =                                              
  static const gmac_ops gkops = { &pre##_hmac, gkinit, gkdestroy };     \
  static const gmac_ops gnkops = { &pre##_nmac, gkinit, gkdestroy };    \
  static const gmac_ops gsslkops = { &pre##_sslmac, gkinit, gkdestroy };        \
 -static const gchash gch = { #pre "-hmac", PRE##_HASHSZ, ghinit };     \
 +static const gchash gch = { name "-hmac", PRE##_HASHSZ, ghinit };     \
  static const ghash_ops gops =                                         \
    { &gch, ghhash, ghdone, ghdestroy, ghcopy };                                \
 -static const gchash gnch = { #pre "-nmac", PRE##_HASHSZ, ghinit };    \
 +static const gchash gnch = { name "-nmac", PRE##_HASHSZ, ghinit };    \
  static const ghash_ops gnops =                                                \
-   { &gch, ghhash, ghdone, ghdestroy, ghcopy };                                \
+   { &gnch, ghhash, ghdone, ghdestroy, ghcopy };                               \
 -static const gchash gsslch = { #pre "-sslmac", PRE##_HASHSZ, ghinit };        \
 +static const gchash gsslch = { name "-sslmac", PRE##_HASHSZ, ghinit };        \
  static const ghash_ops gsslops =                                      \
-   { &gch, ghhash, ghdone, ghdestroy, ghcopy };                                \
+   { &gsslch, ghhash, ghdone, ghdestroy, ghcopy };                     \
                                                                        \
 -HMAC_TEST(PRE, pre)
 +HMAC_TESTX(PRE, pre, name, fname)
 +
 +#define HMAC_TEST(PRE, pre) HMAC_TESTX(PRE, pre, #pre, #pre)
  
  /* --- @HMAC_TEST@ --- *
   *