DHX2, remove some gcc warnings, from Frank Lahm

diff --git a/etc/uams/uams_dhx2_pam.c b/etc/uams/uams_dhx2_pam.c
index bcd858cb93e99fa4215985fee5ca80e830de65cd..10d468b38641c1f3275617bd0fa0971e50642452 100644 (file)
--- a/etc/uams/uams_dhx2_pam.c
+++ b/etc/uams/uams_dhx2_pam.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_dhx2_pam.c,v 1.1 2008-11-22 12:07:26 didg Exp $
+ * $Id: uams_dhx2_pam.c,v 1.2 2008-11-24 20:15:55 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu)
@@ -256,17 +256,10 @@ static struct pam_conv PAM_conversation = {
 static int dhx2_setup(void *obj, char *ibuf, int ibuflen _U_,
                      char *rbuf, int *rbuflen)
 {
-    int i, ret;
-
-    unsigned int g_uint;
+    int ret;
+    size_t nwritten;
     gcry_mpi_t g, Ma;
     char *Ra_binary = NULL;
-    gcry_cipher_hd_t ctx;
-    gcry_error_t ctxerror;
-
-    const int g_len = 4;
-    size_t len;
-    size_t nwritten;
 
     *rbuflen = 0;
 
@@ -307,7 +300,7 @@ static int dhx2_setup(void *obj, char *ibuf, int ibuflen _U_,
     *rbuflen += 2;
 
     /* g is next */
-    gcry_mpi_print( GCRYMPI_FMT_USG, rbuf, 4, &nwritten, g);
+    gcry_mpi_print( GCRYMPI_FMT_USG, (unsigned char *)rbuf, 4, &nwritten, g);
     if (nwritten < 4) {
        memmove( rbuf+4-nwritten, rbuf, nwritten);
        memset( rbuf, 0, 4-nwritten);
@@ -321,15 +314,15 @@ static int dhx2_setup(void *obj, char *ibuf, int ibuflen _U_,
     *rbuflen += 2;
 
     /* p */
-    gcry_mpi_print( GCRYMPI_FMT_USG, rbuf, PRIMEBITS/8, NULL, p);
+    gcry_mpi_print( GCRYMPI_FMT_USG, (unsigned char *)rbuf, PRIMEBITS/8, NULL, p);
     rbuf += PRIMEBITS/8;
     *rbuflen += PRIMEBITS/8;
 
     /* Ma */
-    gcry_mpi_print( GCRYMPI_FMT_USG, rbuf, PRIMEBITS/8, &len, Ma);
-    if (len < PRIMEBITS/8) {
-       memmove(rbuf + (PRIMEBITS/8) - len, rbuf, len);
-       memset(rbuf, 0, (PRIMEBITS/8) - len);
+    gcry_mpi_print( GCRYMPI_FMT_USG, (unsigned char *)rbuf, PRIMEBITS/8, &nwritten, Ma);
+    if (nwritten < PRIMEBITS/8) {
+       memmove(rbuf + (PRIMEBITS/8) - nwritten, rbuf, nwritten);
+       memset(rbuf, 0, (PRIMEBITS/8) - nwritten);
     }
     rbuf += PRIMEBITS/8;
     *rbuflen += PRIMEBITS/8;
@@ -433,13 +426,10 @@ static int pam_login_ext(void *obj, char *uname, struct passwd **uam_pwd,
 
 static int logincont1(void *obj, char *ibuf, int ibuflen, char *rbuf, int *rbuflen)
 {
-    u_int16_t retID;
-    size_t nwritten;
     int ret;
-    *rbuflen = 0;
-
+    size_t nwritten;
     gcry_mpi_t Mb, K, clientNonce;
-    char *K_bin = NULL;
+    unsigned char *K_bin = NULL;
     char serverNonce_bin[16];
     gcry_cipher_hd_t ctx;
     gcry_error_t ctxerror;
@@ -531,7 +521,7 @@ static int logincont1(void *obj, char *ibuf, int ibuflen, char *rbuf, int *rbufl
     *rbuflen += 2;
 
     /* Client nonce + 1 */
-    gcry_mpi_print(GCRYMPI_FMT_USG, rbuf, PRIMEBITS/8, NULL, clientNonce);
+    gcry_mpi_print(GCRYMPI_FMT_USG, (unsigned char *)rbuf, PRIMEBITS/8, NULL, clientNonce);
     /* Server nonce */
     memcpy(rbuf+16, serverNonce_bin, 16);
 
@@ -740,20 +730,16 @@ static void pam_logout() {
 static int changepw_1(void *obj, char *uname,
                      char *ibuf, int ibuflen, char *rbuf, int *rbuflen)
 {
-    unsigned int len;
     *rbuflen = 0;
 
     /* Remember it now, use it in changepw_3 */
     PAM_username = uname;
-    LOG(log_error, logtype_uams, "DHX2 ChangePW: packet 1 processin for user: %s",PAM_username);
-
     return( dhx2_setup(obj, ibuf, ibuflen, rbuf, rbuflen) );
 }
 
 static int changepw_2(void *obj, 
                      char *ibuf, int ibuflen, char *rbuf, int *rbuflen)
 {
-    LOG(log_error, logtype_uams, "DHX2 ChangePW: packet 2 processing");
     return( logincont1(obj, ibuf, ibuflen, rbuf, rbuflen) );
 }
 
@@ -829,9 +815,6 @@ static int changepw_3(void *obj _U_,
     ibuf[255] = '\0';          /* For safety */
     ibuf[511] = '\0';
 
-    LOG(log_info, logtype_uams, "DHX2 Chgpwd: new pwd \'%s\'",ibuf);
-    LOG(log_info, logtype_uams, "DHX2 Chgpwd: old pwd \'%s\'",ibuf+256);
-
     /* check if new and old password are equal */
     if (memcmp(ibuf, ibuf + 256, 255) == 0) {
        LOG(log_info, logtype_uams, "DHX2 Chgpwd: new and old password are equal");
@@ -876,7 +859,6 @@ static int changepw_3(void *obj _U_,
 error_ctx:
     gcry_cipher_close(ctx);
 error_noctx:
-exit:
     free(K_MD5hash);
     K_MD5hash=NULL;
     gcry_mpi_release(serverNonce);
@@ -893,8 +875,6 @@ static int dhx2_changepw(void *obj _U_, char *uname,
 
     int ret;
 
-    LOG(log_error, logtype_uams, "DHX2 ChangePW: Start!");
-
     switch (dhx2_changepw_status) {
     case 1:
        ret = changepw_1( obj, uname, ibuf, ibuflen, rbuf, rbuflen);

diff --git a/etc/uams/uams_dhx2_passwd.c b/etc/uams/uams_dhx2_passwd.c
index 925c7eec3f7831c662bdeb2f8f73d01c4b4c3777..d9d349b8a17900311a5860e2f4d96c870e56d4a8 100644 (file)
--- a/etc/uams/uams_dhx2_passwd.c
+++ b/etc/uams/uams_dhx2_passwd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_dhx2_passwd.c,v 1.1 2008-11-22 12:07:26 didg Exp $
+ * $Id: uams_dhx2_passwd.c,v 1.2 2008-11-24 20:15:55 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu)
@@ -165,26 +165,20 @@ error:
 static int dhx2_setup(void *obj, char *ibuf, int ibuflen _U_,
                      char *rbuf, int *rbuflen)
 {
-    int i, ret;
-
-    unsigned int g_uint;
+    int ret;
+    size_t nwritten;
     gcry_mpi_t g, Ma;
     char *Ra_binary = NULL;
-    gcry_cipher_hd_t ctx;
-    gcry_error_t ctxerror;
-
-    const int g_len = 4;
-    size_t len;
-    size_t nwritten;
 #ifdef SHADOWPW
     struct spwd *sp;
 #endif /* SHADOWPW */
+
     *rbuflen = 0;
 
     /* Initialize passwd/shadow */
 #ifdef SHADOWPW
     if (( sp = getspnam( dhxpwd->pw_name )) == NULL ) {
-        LOG(log_info, logtype_uams, "no shadow passwd entry for this user");
+        LOG(log_info, logtype_uams, "DHX2: no shadow passwd entry for this user");
         return AFPERR_NOTAUTH;
     }
     dhxpwd->pw_passwd = sp->sp_pwdp;
@@ -232,7 +226,7 @@ static int dhx2_setup(void *obj, char *ibuf, int ibuflen _U_,
     *rbuflen += 2;
 
     /* g is next */
-    gcry_mpi_print( GCRYMPI_FMT_USG, rbuf, 4, &nwritten, g);
+    gcry_mpi_print( GCRYMPI_FMT_USG, (unsigned char *)rbuf, 4, &nwritten, g);
     if (nwritten < 4) {
        memmove( rbuf+4-nwritten, rbuf, nwritten);
        memset( rbuf, 0, 4-nwritten);
@@ -246,15 +240,15 @@ static int dhx2_setup(void *obj, char *ibuf, int ibuflen _U_,
     *rbuflen += 2;
 
     /* p */
-    gcry_mpi_print( GCRYMPI_FMT_USG, rbuf, PRIMEBITS/8, NULL, p);
+    gcry_mpi_print( GCRYMPI_FMT_USG, (unsigned char *)rbuf, PRIMEBITS/8, NULL, p);
     rbuf += PRIMEBITS/8;
     *rbuflen += PRIMEBITS/8;
 
     /* Ma */
-    gcry_mpi_print( GCRYMPI_FMT_USG, rbuf, PRIMEBITS/8, &len, Ma);
-    if (len < PRIMEBITS/8) {
-       memmove(rbuf + (PRIMEBITS/8) - len, rbuf, len);
-       memset(rbuf, 0, (PRIMEBITS/8) - len);
+    gcry_mpi_print( GCRYMPI_FMT_USG, (unsigned char *)rbuf, PRIMEBITS/8, &nwritten, Ma);
+    if (nwritten < PRIMEBITS/8) {
+       memmove(rbuf + (PRIMEBITS/8) - nwritten, rbuf, nwritten);
+       memset(rbuf, 0, (PRIMEBITS/8) - nwritten);
     }
     rbuf += PRIMEBITS/8;
     *rbuflen += PRIMEBITS/8;
@@ -359,17 +353,16 @@ static int logincont1(void *obj, struct passwd **uam_pwd,
                          char *ibuf, int ibuflen,
                          char *rbuf, int *rbuflen)
 {
-    u_int16_t retID;
     size_t nwritten;
     int ret;
-    *rbuflen = 0;
-
     gcry_mpi_t Mb, K, clientNonce;
-    char *K_bin = NULL;
+    unsigned char *K_bin = NULL;
     char serverNonce_bin[16];
     gcry_cipher_hd_t ctx;
     gcry_error_t ctxerror;
 
+    *rbuflen = 0;
+
     Mb = gcry_mpi_new(0);
     K = gcry_mpi_new(0);
     clientNonce = gcry_mpi_new(0);
@@ -457,7 +450,7 @@ static int logincont1(void *obj, struct passwd **uam_pwd,
     *rbuflen += 2;
 
     /* Client nonce + 1 */
-    gcry_mpi_print(GCRYMPI_FMT_USG, rbuf, PRIMEBITS/8, NULL, clientNonce);
+    gcry_mpi_print(GCRYMPI_FMT_USG, (unsigned char *)rbuf, PRIMEBITS/8, NULL, clientNonce);
     /* Server nonce */
     memcpy(rbuf+16, serverNonce_bin, 16);
 
@@ -501,7 +494,6 @@ static int logincont2(void *obj, struct passwd **uam_pwd,
 #ifdef SHADOWPW
     struct spwd *sp;
 #endif /* SHADOWPW */
-    size_t nwritten;
     int ret;
     char *p;
     *rbuflen = 0;
@@ -637,7 +629,7 @@ UAM_MODULE_EXPORT struct uam_export uams_dhx2 = {
 };
 
 
-UAM_MODULE_EXPORT struct uam_export uams_dhx2_pam = {
+UAM_MODULE_EXPORT struct uam_export uams_dhx2_passwd = {
     UAM_MODULE_SERVER,
     UAM_MODULE_VERSION,
     uam_setup, uam_cleanup