Major contribution by Darren Besler

1 files changed, 57 insertions, 59 deletions

diff --git a/libtac/lib/crypt.c b/libtac/lib/crypt.c
index ae726fc..645cf8e 100644
--- a/libtac/lib/crypt.c
+++ b/libtac/lib/crypt.c
@@ -1,6 +1,6 @@
 /* crypt.c - TACACS+ encryption related functions
  * 
- * Copyright (C) 2010, Pawel Krawczyk <kravietz@ceti.pl> and
+ * Copyright (C) 2010, Pawel Krawczyk <pawel.krawczyk@hush.com> and
  * Jeroen Nijhof <jeroen@nijhofnet.nl>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,80 +28,78 @@
    Use data from packet header and secret, which
    should be a global variable */
 u_char *_tac_md5_pad(int len, HDR *hdr)  {
- int n, i, bufsize;
- int bp=0; /* buffer pointer */
- int pp=0; /* pad pointer */
- u_char *pad;
- u_char *buf;
- MD5_CTX mdcontext;
+    int n, i, bufsize;
+    int bp = 0; /* buffer pointer */
+    int pp = 0; /* pad pointer */
+    u_char *pad;
+    u_char *buf;
+    MD5_CTX mdcontext;
 
- /* make pseudo pad */
- n=(int)(len/16)+1;  /* number of MD5 runs */
- bufsize=sizeof(hdr->session_id) + strlen(tac_secret) + sizeof(hdr->version)
-         + sizeof(hdr->seq_no) + MD5_LEN + 10;
- buf= (u_char *) xcalloc(1, bufsize);
- pad= (u_char *) xcalloc(n, MD5_LEN);
+    /* make pseudo pad */
+    n = (int)(len/16)+1;  /* number of MD5 runs */
+    bufsize = sizeof(hdr->session_id) + strlen(tac_secret) + sizeof(hdr->version)
+        + sizeof(hdr->seq_no) + MD5_LEN + 10;
+    buf = (u_char *) xcalloc(1, bufsize);
+    pad = (u_char *) xcalloc(n, MD5_LEN);
 
- for(i=0; i<n; i++) {
- /* MD5_1 = MD5{session_id, secret, version, seq_no}
-    MD5_2 = MD5{session_id, secret, version, seq_no, MD5_1} */
+    for (i=0; i<n; i++) {
+        /* MD5_1 = MD5{session_id, secret, version, seq_no}
+           MD5_2 = MD5{session_id, secret, version, seq_no, MD5_1} */
 
-  /* place session_id, key, version and seq_no in buffer */
-  bp=0;
-  bcopy(&hdr->session_id, buf, sizeof(session_id));
-  bp+=sizeof(session_id);
-  bcopy(tac_secret, buf+bp, strlen(tac_secret));
-  bp+=strlen(tac_secret);
-  bcopy(&hdr->version, buf+bp, sizeof(hdr->version));
-  bp+=sizeof(hdr->version);
-  bcopy(&hdr->seq_no, buf+bp, sizeof(hdr->seq_no));
-  bp+=sizeof(hdr->seq_no);
+        /* place session_id, key, version and seq_no in buffer */
+        bp = 0;
+        bcopy(&hdr->session_id, buf, sizeof(session_id));
+        bp += sizeof(session_id);
+        bcopy(tac_secret, buf+bp, strlen(tac_secret));
+        bp += strlen(tac_secret);
+        bcopy(&hdr->version, buf+bp, sizeof(hdr->version));
+        bp += sizeof(hdr->version);
+        bcopy(&hdr->seq_no, buf+bp, sizeof(hdr->seq_no));
+        bp += sizeof(hdr->seq_no);
 
-  /* append previous pad if this is not the first run */
-  if(i) {
-    bcopy(pad+((i-1)*MD5_LEN), buf+bp, MD5_LEN);
-    bp+=MD5_LEN;
-  }
+        /* append previous pad if this is not the first run */
+        if (i) {
+            bcopy(pad+((i-1)*MD5_LEN), buf+bp, MD5_LEN);
+            bp+=MD5_LEN;
+        }
   
-  MD5Init(&mdcontext);
-  MD5Update(&mdcontext, buf, bp);
-  /* this is because MD5 implementation has changed between
-   * pppd versions 2.2.0g and 2.3.4
-   */
+        MD5Init(&mdcontext);
+        MD5Update(&mdcontext, buf, bp);
+        /* this is because MD5 implementation has changed between
+         * pppd versions 2.2.0g and 2.3.4
+         */
 #if 1
-  MD5Final(pad+pp, &mdcontext); /* correct for pppd-2.3.4 */
+        MD5Final(pad+pp, &mdcontext); /* correct for pppd-2.3.4 */
 #else
-  MD5Final(&mdcontext); /* correct for pppd-2.2.0g */
-  bcopy(&mdcontext.digest, pad+pp, MD5_LEN);
+        MD5Final(&mdcontext); /* correct for pppd-2.2.0g */
+        bcopy(&mdcontext.digest, pad+pp, MD5_LEN);
 #endif
    
-  pp+=MD5_LEN;
- }
+        pp += MD5_LEN;
+    }
 
- free(buf);
- return(pad);
+    free(buf);
+    return(pad);
  
-} /* _tac_md5_pad */
+}    /* _tac_md5_pad */
 
 /* Perform encryption/decryption on buffer. This means simply XORing
    each byte from buffer with according byte from pseudo-random
    pad. */
 void _tac_crypt(u_char *buf, HDR *th, int length) {
- int i;
- u_char *pad;
+    int i;
+    u_char *pad;
  
- /* null operation if no encryption requested */
- if(th->encryption == TAC_PLUS_ENCRYPTED) {
+    /* null operation if no encryption requested */
+    if(th->encryption == TAC_PLUS_ENCRYPTED_FLAG) {
+        pad = _tac_md5_pad(length, th);
  
-  pad=_tac_md5_pad(length, th);
- 
-  for(i=0; i<length; i++) {
-   *(buf+i) ^= pad[i];
-  }
+        for (i=0; i<length; i++) {
+            *(buf+i) ^= pad[i];
+        }
   
-  free(pad);
- 
- } else {
-  syslog(LOG_WARNING, "%s: using no TACACS+ encryption", __FUNCTION__);
- }
-} /* _tac_crypt */
+        free(pad);
+    } else {
+        TACSYSLOG((LOG_WARNING, "%s: using no TACACS+ encryption", __FUNCTION__))
+    }
+}    /* _tac_crypt */