Removed nonce/apop/pas2, no longer used by anyone

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index e1843eb209c2396a3684203f93eabc6ffb994d21..3bec05b1ed79418c23fe8c800dbfa9ebaf6aaa11 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -82,6 +82,7 @@ char *unique_session_numbers;
 int ScheduledShutdown = 0;
 time_t server_startup_time;
 int panic_fd;
+int openid_level_supported = 0;
 
 /*
  * print the actual stack frame.
@@ -288,7 +289,7 @@ void cmd_info(char *cmdbuf) {
        cprintf("%s\n", config.c_moreprompt);
        cprintf("1\n"); /* 1 = yes, this system supports floors */
        cprintf("1\n"); /* 1 = we support the extended paging options */
-       cprintf("%s\n", CC->cs_nonce);
+       cprintf("\n");  /* nonce no longer supported */
        cprintf("1\n"); /* 1 = yes, this system supports the QNOP command */
 
 #ifdef HAVE_LDAP
@@ -316,7 +317,7 @@ void cmd_info(char *cmdbuf) {
        cprintf("%s\n", svn_revision());
 
        if (config.c_auth_mode == AUTHMODE_NATIVE) {
-               cprintf("1\n"); /* OpenID is enabled when using native auth */
+               cprintf("%d\n", openid_level_supported); /* OpenID is enabled when using native auth */
        }
        else {
                cprintf("0\n"); /* OpenID is disabled when using non-native auth */
@@ -889,22 +890,6 @@ void cmd_asyn(char *argbuf)
 }
 
 
-/*
- * Generate a "nonce" for APOP-style authentication.
- *
- * RFC 1725 et al specify a PID to be placed in front of the nonce.
- * Quoth BTX: That would be stupid.
- */
-void generate_nonce(CitContext *con) {
-       struct timeval tv;
-
-       memset(con->cs_nonce, NONCE_SIZE, 0);
-       gettimeofday(&tv, NULL);
-       memset(con->cs_nonce, NONCE_SIZE, 0);
-       snprintf(con->cs_nonce, NONCE_SIZE, "<%d%ld@%s>",
-               rand(), (long)tv.tv_usec, config.c_fqdn);
-}
-
 
 /*
  * Back-end function for starting a session
@@ -932,7 +917,6 @@ void begin_session(CitContext *con)
        *con->fake_hostname = '\0';
        *con->fake_roomname = '\0';
        *con->cs_clientinfo = '\0';
-       generate_nonce(con);
        safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host);
        safestrncpy(con->cs_addr, "", sizeof con->cs_addr);
        con->cs_UDSclientUID = -1;