[ViewVC] Diff of: cvs/gvpe/src/crypto.h

Comparing gvpe/src/crypto.h (file contents):
Revision 1.1 by root, Thu Jun 30 11:43:38 2016 UTC vs.
Revision 1.2 by root, Thu Jun 30 16:31:00 2016 UTC

     Source for a non-source form of such a combination shall include the
     source code for the parts of OpenSSL used as well as that of the
     covered work.
 */
-#ifndef SSLCOMPAT_H
+#ifndef CRYPTO_H__
-#define SSLCOMPAT_H
+#define CRYPTO_H__
 #include <slog.h>
 #include <openssl/opensslv.h>
 #include <openssl/hmac.h>
+#include <openssl/evp.h>
 // openssl 0.9.8/1.0.0 compatibility
 #if OPENSSL_VERSION_NUMBER < 0x10001000
   #define require101(exp) exp
 #else
   #define require101(exp) require (exp)
 #endif
 /* this pretty much wraps the slightly weird openssl api */
-struct hmac
+class hmac
 {
   HMAC_CTX *ctx;
+public:
   hmac ();
   ~hmac ();
-  void init (const void *key = 0, int key_len = 0, const EVP_MD *hash = 0)
+  void init (const void *key, int key_len, const EVP_MD *hash = 0)
   {
     require101 (HMAC_Init_ex (ctx, key, key_len, hash, 0));
+  }
+  void init ()
+  {
+    require101 (HMAC_Init_ex (ctx, 0, 0, 0, 0));
   }
   void
   add (const void *data, int len)
   {
   {
     return HMAC_size (ctx);
   }
 };
+/* cheap alloc/free wrapper only atm. */
+class cipher
+{
+  EVP_CIPHER_CTX *ctx;
+public:
+  cipher ();
+  ~cipher ();
+  operator EVP_CIPHER_CTX *()
+  {
+    return ctx;
+  }
+};
 #endif

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines