Implement range-checking in all counts in apps. Turns out only a couple of cases were missing. And make the range-checking code more strict. Replace almost all opt_ulong() calls with opt_long() Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
		
			
				
	
	
		
			172 lines
		
	
	
		
			5.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			172 lines
		
	
	
		
			5.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* ====================================================================
 | 
						|
 * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
 | 
						|
 *
 | 
						|
 * Redistribution and use in source and binary forms, with or without
 | 
						|
 * modification, are permitted provided that the following conditions
 | 
						|
 * are met:
 | 
						|
 *
 | 
						|
 * 1. Redistributions of source code must retain the above copyright
 | 
						|
 *    notice, this list of conditions and the following disclaimer.
 | 
						|
 *
 | 
						|
 * 2. Redistributions in binary form must reproduce the above copyright
 | 
						|
 *    notice, this list of conditions and the following disclaimer in
 | 
						|
 *    the documentation and/or other materials provided with the
 | 
						|
 *    distribution.
 | 
						|
 *
 | 
						|
 * 3. All advertising materials mentioning features or use of this
 | 
						|
 *    software must display the following acknowledgment:
 | 
						|
 *    "This product includes software developed by the OpenSSL Project
 | 
						|
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 | 
						|
 *
 | 
						|
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 | 
						|
 *    endorse or promote products derived from this software without
 | 
						|
 *    prior written permission. For written permission, please contact
 | 
						|
 *    openssl-core@openssl.org.
 | 
						|
 *
 | 
						|
 * 5. Products derived from this software may not be called "OpenSSL"
 | 
						|
 *    nor may "OpenSSL" appear in their names without prior written
 | 
						|
 *    permission of the OpenSSL Project.
 | 
						|
 *
 | 
						|
 * 6. Redistributions of any form whatsoever must retain the following
 | 
						|
 *    acknowledgment:
 | 
						|
 *    "This product includes software developed by the OpenSSL Project
 | 
						|
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 | 
						|
 *
 | 
						|
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 | 
						|
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 | 
						|
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 | 
						|
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
 | 
						|
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 | 
						|
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 | 
						|
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 | 
						|
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 | 
						|
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 | 
						|
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 | 
						|
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 | 
						|
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 | 
						|
 * ====================================================================
 | 
						|
 *
 | 
						|
 * This product includes cryptographic software written by Eric Young
 | 
						|
 * (eay@cryptsoft.com).  This product includes software written by Tim
 | 
						|
 * Hudson (tjh@cryptsoft.com).
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
#include "apps.h"
 | 
						|
 | 
						|
#include <ctype.h>
 | 
						|
#include <stdio.h>
 | 
						|
#include <string.h>
 | 
						|
 | 
						|
#include <openssl/bio.h>
 | 
						|
#include <openssl/err.h>
 | 
						|
#include <openssl/rand.h>
 | 
						|
 | 
						|
typedef enum OPTION_choice {
 | 
						|
    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 | 
						|
    OPT_OUT, OPT_ENGINE, OPT_RAND, OPT_BASE64, OPT_HEX
 | 
						|
} OPTION_CHOICE;
 | 
						|
 | 
						|
OPTIONS rand_options[] = {
 | 
						|
    {OPT_HELP_STR, 1, '-', "Usage: %s [flags] num\n"},
 | 
						|
    {OPT_HELP_STR, 1, '-', "Valid options are:\n"},
 | 
						|
    {"help", OPT_HELP, '-', "Display this summary"},
 | 
						|
    {"out", OPT_OUT, '>', "Output file"},
 | 
						|
    {"rand", OPT_RAND, 's',
 | 
						|
     "Load the file(s) into the random number generator"},
 | 
						|
    {"base64", OPT_BASE64, '-', "Base64 encode output"},
 | 
						|
    {"hex", OPT_HEX, '-', "Hex encode output"},
 | 
						|
#ifndef OPENSSL_NO_ENGINE
 | 
						|
    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
 | 
						|
#endif
 | 
						|
    {NULL}
 | 
						|
};
 | 
						|
 | 
						|
int rand_main(int argc, char **argv)
 | 
						|
{
 | 
						|
    BIO *out = NULL;
 | 
						|
    char *inrand = NULL, *outfile = NULL, *prog;
 | 
						|
    OPTION_CHOICE o;
 | 
						|
    int format = FORMAT_BINARY, i, num = -1, r, ret = 1;
 | 
						|
 | 
						|
    prog = opt_init(argc, argv, rand_options);
 | 
						|
    while ((o = opt_next()) != OPT_EOF) {
 | 
						|
        switch (o) {
 | 
						|
        case OPT_EOF:
 | 
						|
        case OPT_ERR:
 | 
						|
 opthelp:
 | 
						|
            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
 | 
						|
            goto end;
 | 
						|
        case OPT_HELP:
 | 
						|
            opt_help(rand_options);
 | 
						|
            ret = 0;
 | 
						|
            goto end;
 | 
						|
        case OPT_OUT:
 | 
						|
            outfile = opt_arg();
 | 
						|
            break;
 | 
						|
        case OPT_ENGINE:
 | 
						|
            (void)setup_engine(opt_arg(), 0);
 | 
						|
            break;
 | 
						|
        case OPT_RAND:
 | 
						|
            inrand = opt_arg();
 | 
						|
            break;
 | 
						|
        case OPT_BASE64:
 | 
						|
            format = FORMAT_BASE64;
 | 
						|
            break;
 | 
						|
        case OPT_HEX:
 | 
						|
            format = FORMAT_TEXT;
 | 
						|
            break;
 | 
						|
        }
 | 
						|
    }
 | 
						|
    argc = opt_num_rest();
 | 
						|
    argv = opt_rest();
 | 
						|
 | 
						|
    if (argc != 1 || !opt_int(argv[0], &num) || num < 0)
 | 
						|
        goto opthelp;
 | 
						|
 | 
						|
    app_RAND_load_file(NULL, (inrand != NULL));
 | 
						|
    if (inrand != NULL)
 | 
						|
        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
 | 
						|
                   app_RAND_load_files(inrand));
 | 
						|
 | 
						|
    out = bio_open_default(outfile, 'w', format);
 | 
						|
    if (out == NULL)
 | 
						|
        goto end;
 | 
						|
 | 
						|
    if (format == FORMAT_BASE64) {
 | 
						|
        BIO *b64 = BIO_new(BIO_f_base64());
 | 
						|
        if (b64 == NULL)
 | 
						|
            goto end;
 | 
						|
        out = BIO_push(b64, out);
 | 
						|
    }
 | 
						|
 | 
						|
    while (num > 0) {
 | 
						|
        unsigned char buf[4096];
 | 
						|
        int chunk;
 | 
						|
 | 
						|
        chunk = num;
 | 
						|
        if (chunk > (int)sizeof(buf))
 | 
						|
            chunk = sizeof buf;
 | 
						|
        r = RAND_bytes(buf, chunk);
 | 
						|
        if (r <= 0)
 | 
						|
            goto end;
 | 
						|
        if (format != FORMAT_TEXT) /* hex */
 | 
						|
            BIO_write(out, buf, chunk);
 | 
						|
        else {
 | 
						|
            for (i = 0; i < chunk; i++)
 | 
						|
                BIO_printf(out, "%02x", buf[i]);
 | 
						|
        }
 | 
						|
        num -= chunk;
 | 
						|
    }
 | 
						|
    if (format == FORMAT_TEXT)
 | 
						|
        BIO_puts(out, "\n");
 | 
						|
    (void)BIO_flush(out);
 | 
						|
 | 
						|
    app_RAND_write_file(NULL);
 | 
						|
    ret = 0;
 | 
						|
 | 
						|
 end:
 | 
						|
    BIO_free_all(out);
 | 
						|
    return (ret);
 | 
						|
}
 |