This commit replaces most atoi() calls (which don't report errors) with a strtol() wrapper function for stronger string -> integer conversion validation.
131 lines
3.0 KiB
C
131 lines
3.0 KiB
C
/*
|
|
*****************************************************************************
|
|
*
|
|
* File: fko_util.c
|
|
*
|
|
* Author: Michael Rash
|
|
*
|
|
* Purpose: Provide a set of common utility functions that fwknop can use.
|
|
*
|
|
* Copyright 2012 Michael Rash (mbr@cipherdyne.org)
|
|
*
|
|
* License (GNU Public License):
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
* USA
|
|
*
|
|
*****************************************************************************
|
|
*/
|
|
#include "fko_common.h"
|
|
#include "fko.h"
|
|
#include <errno.h>
|
|
|
|
/* Validate encoded message length
|
|
*/
|
|
int
|
|
is_valid_encoded_msg_len(const int len)
|
|
{
|
|
if(len < MIN_SPA_ENCODED_MSG_SIZE || len >= MAX_SPA_ENCODED_MSG_SIZE)
|
|
return(0);
|
|
|
|
return(1);
|
|
}
|
|
|
|
/* Validate plaintext input size
|
|
*/
|
|
int
|
|
is_valid_pt_msg_len(const int len)
|
|
{
|
|
if(len < MIN_SPA_PLAINTEXT_MSG_SIZE || len >= MAX_SPA_PLAINTEXT_MSG_SIZE)
|
|
return(0);
|
|
|
|
return(1);
|
|
}
|
|
|
|
/* Validate digest length
|
|
*/
|
|
int
|
|
is_valid_digest_len(const int len)
|
|
{
|
|
switch(len)
|
|
{
|
|
case MD5_B64_LEN:
|
|
break;
|
|
case SHA1_B64_LEN:
|
|
break;
|
|
case SHA256_B64_LEN:
|
|
break;
|
|
case SHA384_B64_LEN:
|
|
break;
|
|
case SHA512_B64_LEN:
|
|
break;
|
|
default:
|
|
return(0);
|
|
}
|
|
|
|
return(1);
|
|
}
|
|
|
|
int
|
|
strtol_wrapper(const char * const str, const int min,
|
|
const int max, const int exit_upon_err, int *err)
|
|
{
|
|
int val;
|
|
|
|
errno = 0;
|
|
*err = FKO_SUCCESS;
|
|
|
|
val = strtol(str, (char **) NULL, 10);
|
|
|
|
if ((errno == ERANGE || (errno != 0 && val == 0)))
|
|
{
|
|
*err = errno;
|
|
if(exit_upon_err == EXIT_UPON_ERR)
|
|
{
|
|
perror("strtol");
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
}
|
|
|
|
if(val < min)
|
|
{
|
|
*err = FKO_ERROR_INVALID_DATA;
|
|
if(exit_upon_err == EXIT_UPON_ERR)
|
|
{
|
|
fprintf(stderr, "[*] Value %d out of range %d - %d\n",
|
|
val, min, max);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
}
|
|
|
|
/* allow max==0 to be an exception where we don't care about the
|
|
* maximum - note that the ERANGE check is still in place above
|
|
*/
|
|
if((max > 0) && (val > max))
|
|
{
|
|
*err = FKO_ERROR_INVALID_DATA;
|
|
if(exit_upon_err == EXIT_UPON_ERR)
|
|
{
|
|
fprintf(stderr, "[*] Value %d out of range %d - %d\n",
|
|
val, min, max);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
}
|
|
|
|
return val;
|
|
}
|
|
|
|
/***EOF***/
|