/*
- * Copyright (c) 2011, JANET(UK)
+ * Copyright (c) 2012, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* or implied warranty.
*/
-#include "gsscon.h"
+#include <gsscon.h>
/* --------------------------------------------------------------------------- */
/* Display the contents of the buffer in hex and ascii */
if (!err) {
const char *ptr = inBuffer;
do {
- ssize_t count = write (inSocket, ptr, inBufferLength - bytesWritten);
+ ssize_t count;
+
+ count = write (inSocket, ptr, inBufferLength - bytesWritten);
+
if (count < 0) {
/* Try again on EINTR */
if (errno != EINTR) { err = errno; }
} while (!err && (bytesWritten < inBufferLength));
}
- if (err) { gsscon_print_error (err, "WritBuffer failed"); }
+ if (err) { gsscon_print_error (err, "WriteBuffer failed"); }
return err;
}
if (!err) {
tokenLength = ntohl (tokenLength);
token = malloc (tokenLength);
- memset (token, 0, tokenLength);
+ if (token==NULL) {
+ err=EIO;
+ } else {
+ memset (token, 0, tokenLength);
- err = ReadBuffer (inSocket, tokenLength, token);
+ err = ReadBuffer (inSocket, tokenLength, token);
+ }
}
if (!err) {
- printf ("Read token:\n");
- PrintBuffer (token, tokenLength);
-
*outTokenLength = tokenLength;
*outTokenValue = token;
token = NULL; /* only free on error */
}
if (!err) {
- printf ("Wrote token:\n");
- PrintBuffer (inTokenValue, inTokenLength);
+ // printf ("Wrote token:\n");
+ // PrintBuffer (inTokenValue, inTokenLength);
+
} else {
gsscon_print_error (err, "gsscon_write_token() failed");
}
if (!err) {
memcpy (unencryptedToken, outputBuffer.value, outputBuffer.length);
- printf ("Unencrypted token:\n");
- PrintBuffer (unencryptedToken, outputBuffer.length);
+ // printf ("Unencrypted token:\n");
+ // PrintBuffer (unencryptedToken, outputBuffer.length);
*outTokenLength = outputBuffer.length;
*outTokenValue = unencryptedToken;
}
if (!err) {
- printf ("Unencrypted token:\n");
- PrintBuffer (inToken, inTokenLength);
+ // printf ("Unencrypted token:\n");
+ // PrintBuffer (inToken, inTokenLength);
err = gsscon_write_token (inSocket, outputBuffer.value, outputBuffer.length);
}