Allow truly arbitrary debug levels to be specified via DEBUG=

[people/xl0/gpxe.git] / src / crypto / chap.c

diff --git a/src/crypto/chap.c b/src/crypto/chap.c
index 997f539..6bebaca 100644 (file)
--- a/src/crypto/chap.c
+++ b/src/crypto/chap.c
@@ -18,9 +18,9 @@
 
 #include <stddef.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <malloc.h>
 #include <gpxe/crypto.h>
 #include <gpxe/chap.h>
 
@@ -43,24 +43,29 @@
  */
 int chap_init ( struct chap_challenge *chap,
                struct digest_algorithm *digest ) {
+       size_t state_len;
+       void *state;
+
        assert ( chap->digest == NULL );
        assert ( chap->digest_context == NULL );
        assert ( chap->response == NULL );
 
+       DBG ( "CHAP %p initialising with %s digest\n", chap, digest->name );
+
+       state_len = ( digest->context_len + digest->digest_len );
+       state = malloc ( state_len );
+       if ( ! state ) {
+               DBG ( "CHAP %p could not allocate %d bytes for state\n",
+                     chap, state_len );
+               return -ENOMEM;
+       }
+       
        chap->digest = digest;
-       chap->digest_context = malloc ( digest->context_len );
-       if ( ! chap->digest_context )
-               goto err;
-       chap->response = malloc ( digest->digest_len );
-       if ( ! chap->response )
-               goto err;
+       chap->digest_context = state;
+       chap->response = ( state + digest->context_len );
        chap->response_len = digest->digest_len;
        chap->digest->init ( chap->digest_context );
        return 0;
-
- err:
-       chap_finish ( chap );
-       return -ENOMEM;
 }
 
 /**
@@ -75,6 +80,9 @@ void chap_update ( struct chap_challenge *chap, const void *data,
        assert ( chap->digest != NULL );
        assert ( chap->digest_context != NULL );
 
+       if ( ! chap->digest )
+               return;
+
        chap->digest->update ( chap->digest_context, data, len );
 }
 
@@ -91,6 +99,11 @@ void chap_respond ( struct chap_challenge *chap ) {
        assert ( chap->digest_context != NULL );
        assert ( chap->response != NULL );
 
+       DBG ( "CHAP %p responding to challenge\n", chap );
+
+       if ( ! chap->digest )
+               return;
+
        chap->digest->finish ( chap->digest_context, chap->response );
 }
 
@@ -100,9 +113,10 @@ void chap_respond ( struct chap_challenge *chap ) {
  * @v chap             CHAP challenge/response
  */
 void chap_finish ( struct chap_challenge *chap ) {
-       free ( chap->digest_context );
-       chap->digest_context = NULL;
-       free ( chap->response );
-       chap->response = NULL;
-       chap->digest = NULL;
+       void *state = chap->digest_context;
+
+       DBG ( "CHAP %p finished\n", chap );
+
+       free ( state );
+       memset ( chap, 0, sizeof ( *chap ) );
 }