fixed pgp UAM so that it builds at all

[netatalk.git] / etc / uams / uams_pgp.c

diff --git a/etc/uams/uams_pgp.c b/etc/uams/uams_pgp.c
index 7d0ea59e26bca833f791791fd30a99e9da24bf3b..66efa87332285e92c9b407d9839bd5e65b50a3c0 100644 (file)
--- a/etc/uams/uams_pgp.c
+++ b/etc/uams/uams_pgp.c
@@ -15,7 +15,15 @@
 #include <pwd.h>
 #include <syslog.h>
 
+#ifdef OPENSSL_DHX
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/cast.h>
+#else
 #include <bn.h>
+#include <dh.h>
+#include <cast.h>
+#endif
 
 #include <atalk/afp.h>
 #include <atalk/uam.h>
@@ -31,7 +39,8 @@
 
 /* the secret key */
 static struct passwd *pgppwd;
-
+static CAST_KEY castkey;
+static u_int8_t randbuf[16];
 
 /* pgp passwd */
 static int pgp_login(void *obj, struct passwd **uam_pwd,
@@ -75,7 +84,7 @@ static int pgp_login(void *obj, struct passwd **uam_pwd,
     if (uam_afpserver_option(obj, UAM_OPTION_SIGNATURE, 
                             (void *) &name, NULL) < 0) {
       *rbuflen = 0;
-      goto passwd_fail;
+      goto pgp_fail;
     }
     memcpy(rbuf + KEYSIZE, name, KEYSIZE); 
 
@@ -87,6 +96,7 @@ static int pgp_logincont(void *obj, struct passwd **uam_pwd,
                         char *ibuf, int ibuflen, 
                         char *rbuf, int *rbuflen)
 {
+       unsigned char iv[] = "RJscorat";
     BIGNUM *bn1, *bn2, *bn3;
     u_int16_t sessid;
     char *p;