From 23e209a6a09ff2e3c0f12663139c8a8dddfefbfb Mon Sep 17 00:00:00 2001 From: deuce <> Date: Sun, 20 Mar 2011 21:34:30 +0000 Subject: [PATCH] Update for new API in Cryptlib 3.4 --- src/syncterm/ssh.c | 6 +++--- src/syncterm/st_crypt.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/syncterm/ssh.c b/src/syncterm/ssh.c index 825caad8ea..532dfdebc1 100644 --- a/src/syncterm/ssh.c +++ b/src/syncterm/ssh.c @@ -56,7 +56,7 @@ void ssh_input_thread(void *args) sprintf(str,"Error %d recieving data",status); strcat(str,"\r\n\r\n"); err_len=sizeof(str)-strlen(str)-1; - cl.GetAttributeString(ssh_session, CRYPT_ATTRIBUTE_INT_ERRORMESSAGE, str+strlen(str), &err_len); + cl.GetAttributeString(ssh_session, CRYPT_ATTRIBUTE_ERRORMESSAGE, str+strlen(str), &err_len); uifcmsg("Error recieving data",str); break; } @@ -104,7 +104,7 @@ void ssh_output_thread(void *args) sprintf(str,"Error %d sending data",status); strcat(str,"\r\n\r\n"); err_len=sizeof(str)-strlen(str)-1; - cl.GetAttributeString(ssh_session, CRYPT_ATTRIBUTE_INT_ERRORMESSAGE, str+strlen(str), &err_len); + cl.GetAttributeString(ssh_session, CRYPT_ATTRIBUTE_ERRORMESSAGE, str+strlen(str), &err_len); uifcmsg("Error sending data",str); } sent += ret; @@ -219,7 +219,7 @@ int ssh_connect(struct bbslist *bbs) sprintf(str,"Error %d activating session",status); strcat(str,"\r\n\r\n"); err_len=sizeof(str)-strlen(str)-1; - cl.GetAttributeString(ssh_session, CRYPT_ATTRIBUTE_INT_ERRORMESSAGE, str+strlen(str), &err_len); + cl.GetAttributeString(ssh_session, CRYPT_ATTRIBUTE_ERRORMESSAGE, str+strlen(str), &err_len); uifcmsg("Error activating session",str); conn_api.terminate=1; uifc.pop(NULL); diff --git a/src/syncterm/st_crypt.h b/src/syncterm/st_crypt.h index 23c6eca65b..c355381eab 100644 --- a/src/syncterm/st_crypt.h +++ b/src/syncterm/st_crypt.h @@ -5,6 +5,9 @@ #ifndef WITHOUT_CRYPTLIB #include"cryptlib.h" +#if CRYPTLIB_VERSION < 3400 +#define CRYPT_ATTRIBUTE_ERRORMESSAGE CRYPT_ATTRIBUTE_INT_ERRORMESSAGE +#endif #if defined(_MSC_VER) #undef C_RET -- GitLab