Changeset 403:26aafbbc1640 in freeDiameter for freeDiameter/cnxctx.c

Timestamp:

Jul 8, 2010, 2:24:19 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Cleanup all compilation warnings in base code for 32 bit arch

File:

• freeDiameter/cnxctx.c (modified) (6 diffs)

freeDiameter/cnxctx.c

@@ -162 +162 @@
 #else /* DISABLE_SCTP */
         struct cnxctx * cnx = NULL;
-        sSS dummy;
-        sSA * sa = (sSA *) &dummy;
 
         TRACE_ENTRY("%hu %p", port, ep_list);
@@ -224 +222 @@
         socklen_t ss_len = sizeof(ss);
         int cli_sock = 0;
-        struct fd_endpoint * ep;
 
         TRACE_ENTRY("%p", serv);
@@ -988 +985 @@
 int fd_tls_verify_credentials(gnutls_session_t session, struct cnxctx * conn, int verbose)
 {
-        int ret, i;
+        int i;
+        unsigned int gtret;
         const gnutls_datum_t *cert_list;
         unsigned int cert_list_size;
@@ -1018 +1016 @@
                                 fd_log_debug("\t - TLS/IA session\n");
                                 break;
-
-
-                        #ifdef ENABLE_SRP
-                        case GNUTLS_CRD_SRP:
-                                fd_log_debug("\t - SRP session with username %s\n",
-                                        gnutls_srp_server_get_username (session));
-                                break;
-                        #endif
 
                         case GNUTLS_CRD_PSK:
@@ -1049 +1039 @@
                                                 gnutls_dh_get_prime_bits (session));
                                 }
+                                break;
+                                
+                        case GNUTLS_CRD_SRP:
+                                fd_log_debug("\t - SRP session with username %s\n",
+                                        gnutls_srp_server_get_username (session));
+                                break;
+
+                        default:
+                                fd_log_debug("\t - Different type of credentials for the session (%d).\n", cred);
+                                break;
+
                 }
 
@@ -1073 +1074 @@
         
         /* First, use built-in verification */
-        CHECK_GNUTLS_DO( gnutls_certificate_verify_peers2 (session, &ret), return EINVAL );
-        if (ret) {
+        CHECK_GNUTLS_DO( gnutls_certificate_verify_peers2 (session, &gtret), return EINVAL );
+        if (gtret) {
                 if (TRACE_BOOL(INFO)) {
                         fd_log_debug("TLS: Remote certificate invalid on socket %d (Remote: '%s')(Connection: '%s') :\n", conn->cc_socket, conn->cc_remid, conn->cc_id);
-                        if (ret & GNUTLS_CERT_INVALID)
+                        if (gtret & GNUTLS_CERT_INVALID)
                                 fd_log_debug(" - The certificate is not trusted (unknown CA? expired?)\n");
-                        if (ret & GNUTLS_CERT_REVOKED)
+                        if (gtret & GNUTLS_CERT_REVOKED)
                                 fd_log_debug(" - The certificate has been revoked.\n");
-                        if (ret & GNUTLS_CERT_SIGNER_NOT_FOUND)
+                        if (gtret & GNUTLS_CERT_SIGNER_NOT_FOUND)
                                 fd_log_debug(" - The certificate hasn't got a known issuer.\n");
-                        if (ret & GNUTLS_CERT_SIGNER_NOT_CA)
+                        if (gtret & GNUTLS_CERT_SIGNER_NOT_CA)
                                 fd_log_debug(" - The certificate signer is not a CA, or uses version 1, or 3 without basic constraints.\n");
-                        if (ret & GNUTLS_CERT_INSECURE_ALGORITHM)
+                        if (gtret & GNUTLS_CERT_INSECURE_ALGORITHM)
                                 fd_log_debug(" - The certificate signature uses a weak algorithm.\n");
                 }