chiark / gitweb /
Merge branch '2.3.x'
authorMark Wooding <mdw@distorted.org.uk>
Tue, 4 Jul 2017 23:51:36 +0000 (00:51 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 4 Jul 2017 23:51:36 +0000 (00:51 +0100)
commit8276a9c565bc29afbc6cc120dfde0801c06c2bbd
treedb2e74d202781add529c40383561f11c62ef2230
parent3eda76a3c2766af9b7ab425b586a5daf79dc4971
parent4dafd519dbbdc17887f2de4f6cabe33ac4667ab0
Merge branch '2.3.x'

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

Conflicts:
symm/hmac-def.h
symm/hmac-def.h