Updated DH code, added code to tpqc to send DH info, removed extra gsscon messages.

[trust_router.git] / gsscon / gsscon_active.c

diff --git a/gsscon/gsscon_active.c b/gsscon/gsscon_active.c
index d933944..dff1da2 100755 (executable)
--- a/gsscon/gsscon_active.c
+++ b/gsscon/gsscon_active.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, JANET(UK)
+ * Copyright (c) 2012, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@
  * or implied warranty.
  */
 
-#include "gsscon.h"
+#include <gsscon.h>
 
 /* --------------------------------------------------------------------------- */
 
@@ -211,14 +211,14 @@ int gsscon_active_authenticate (int   inSocket,
 
     majorStatus = GSS_S_CONTINUE_NEEDED;
 
-    gss_OID_desc EAP_OID = { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x01\x11" };
+    gss_OID_desc EAP_OID = { 9, "\x2B\x06\x01\x05\x05\x0F\x01\x01\x11" };
  
    while (!err && (majorStatus != GSS_S_COMPLETE)) {
         gss_buffer_desc outputToken = { 0, NULL }; /* buffer to send to the server */
         OM_uint32 requestedFlags = (GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG | GSS_C_SEQUENCE_FLAG | 
                                     GSS_C_CONF_FLAG | GSS_C_INTEG_FLAG);
         
-        printf ("Calling gss_init_sec_context...\n");
+       // printf ("Calling gss_init_sec_context...\n");
         majorStatus = gss_init_sec_context (&minorStatus, 
                                             clientCredentials, 
                                             &gssContext,