WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

remove mp_todecimal to fix sp build

pull/247/head
Jacob Barthelmeh 2020-02-26 15:23:18 -07:00
parent 552b763e4f
commit 4aa65dd30e
2 changed files with 10 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/internal.c
View File

@ -8835,45 +8835,18 @@ int wolfSSH_oct2dec(WOLFSSH* ssh, byte* oct, word32 octSz)
return WS_BAD_ARGUMENT;
}
#if defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || \
defined(WOLFSSL_DEBUG_MATH) || defined(DEBUG_WOLFSSL) || \
defined(WOLFSSL_PUBLIC_MP)
/* convert octal string to int without mp_read_radix() */
ret = 0;
for (word32 i = 0; i < octSz; i++)
{
mp_int tmp;
char decimalString[WOLFSSH_MAX_OCTET_LEN + 1];
ret = mp_init(&tmp);
if (ret == MP_OKAY) {
ret = mp_read_radix(&tmp, (const char*)oct, 8);
if (oct[i] < '0' || oct[0] > '7') {
ret = WS_BAD_ARGUMENT;
break;
}
if (ret == MP_OKAY) {
/* convert octal to decimal */
ret = mp_todecimal(&tmp, decimalString);
if (ret == MP_OKAY) {
/* convert string to int */
ret = atoi(decimalString);
}
}
mp_clear(&tmp);
ret <<= 3;
ret |= (oct[i] - '0');
}
#else
{
/* convert octal string to int without mp_read_radix() */
ret = 0;
for (word32 i = 0; i < octSz; i++)
{
if (oct[i] < '0' || oct[0] > '7') {
ret = WS_BAD_ARGUMENT;
break;
}
ret <<= 3;
ret |= (oct[i] - '0');
}
}
#endif
return ret;
}

40
src/wolfscp.c
View File

@ -754,17 +754,10 @@ int ChannelCommandIsScp(WOLFSSH* ssh)
static int GetScpFileMode(WOLFSSH* ssh, byte* buf, word32 bufSz,
word32* inOutIdx)
{
int ret;
int ret = WS_SUCCESS;
word32 idx;
byte modeOctet[SCP_MODE_OCTET_LEN + 1];
#if defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || \
defined(WOLFSSL_DEBUG_MATH) || defined(DEBUG_WOLFSSL) || \
defined(WOLFSSL_PUBLIC_MP)
mp_int tmp;
char decimalString[SCP_MODE_OCTET_LEN + 1];
#else
int mode, i;
#endif
if (ssh == NULL || buf == NULL || inOutIdx == NULL ||
bufSz < (SCP_MODE_OCTET_LEN + 1))
@ -781,36 +774,6 @@ static int GetScpFileMode(WOLFSSH* ssh, byte* buf, word32 bufSz,
modeOctet[SCP_MODE_OCTET_LEN] = '\0';
idx += SCP_MODE_OCTET_LEN;
#if defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || \
defined(WOLFSSL_DEBUG_MATH) || defined(DEBUG_WOLFSSL) || \
defined(WOLFSSL_PUBLIC_MP)
ret = mp_init(&tmp);
if (ret == MP_OKAY) {
ret = mp_read_radix(&tmp, (const char*)modeOctet, 8);
}
if (ret == MP_OKAY) {
/* convert octal to decimal */
ret = mp_todecimal(&tmp, decimalString);
if (ret == MP_OKAY) {
/* convert string to int */
ssh->scpFileMode = atoi(decimalString);
}
}
if (ret == MP_OKAY) {
/* eat trailing space */
if (bufSz >= (word32)(idx + 1))
idx++;
ret = WS_SUCCESS;
*inOutIdx = idx;
}
mp_clear(&tmp);
#else
ret = WS_SUCCESS;
/* convert octal string to int without mp_read_radix() */
mode = 0;
@ -833,7 +796,6 @@ static int GetScpFileMode(WOLFSSH* ssh, byte* buf, word32 bufSz,
ret = WS_SUCCESS;
*inOutIdx = idx;
}
#endif
return ret;
}