--- gvpe/src/util.h	2003/10/16 02:41:21	1.9
+++ gvpe/src/util.h	2004/05/10 20:13:10	1.12
@@ -22,8 +22,12 @@
 #ifndef UTIL_H__
 #define UTIL_H__
 
+#include <openssl/rsa.h>
+
+#include "gettext.h"
+
+#include "slog.h"
 #include "iom.h"
-#include "device.h"
 
 /*
  * check for an existing vped for this net, and write pid to pidfile
@@ -41,15 +45,14 @@
 extern int detach (int do_detach);
 
 /*
- * Set all files and paths according to netname
- */
-extern void make_names (void);
-
-/*
  * check wether the given path is an absolute pathname
  */
 #define ABSOLUTE_PATH(c) ((c)[0] == '/')
 
+/*****************************************************************************/
+
+typedef u8 mac[6];
+
 extern void id2mac (unsigned int id, void *m);
 
 #define mac2id(p) ((p)[0] & 0x01 ? 0 : ((p)[4] << 8) | (p)[5])
@@ -113,5 +116,27 @@
 u8 *base64_encode (const u8 *data, unsigned int len);
 #endif
 
+/*****************************************************************************/
+
+typedef u8 rsaclear[RSA_KEYLEN - RSA_OVERHEAD]; // challenge data;
+typedef u8 rsacrypt[RSA_KEYLEN]; // encrypted challenge
+
+static inline void
+rsa_encrypt (RSA *key, const rsaclear &chg, rsacrypt &encr)
+{
+  if (RSA_public_encrypt (sizeof chg,
+                          (unsigned char *)&chg, (unsigned char *)&encr,
+                          key, RSA_PKCS1_OAEP_PADDING) < 0)
+    fatal ("RSA_public_encrypt error");
+}
+
+static inline bool
+rsa_decrypt (RSA *key, const rsacrypt &encr, rsaclear &chg)
+{
+  return RSA_private_decrypt (sizeof encr,
+                              (unsigned char *)&encr, (unsigned char *)&chg,
+                              key, RSA_PKCS1_OAEP_PADDING) > 0;
+}
+
 #endif