This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
		
	
		
			
				
	
	
		
			146 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			146 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* ====================================================================
 | 
						|
 * Copyright (c) 1998-2000 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).
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
/*-
 | 
						|
 * Usage: winrand [filename]
 | 
						|
 *
 | 
						|
 * Collects entropy from mouse movements and other events and writes
 | 
						|
 * random data to filename or .rnd
 | 
						|
 */
 | 
						|
 | 
						|
#include <windows.h>
 | 
						|
#include <openssl/opensslv.h>
 | 
						|
#include <openssl/rand.h>
 | 
						|
 | 
						|
LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 | 
						|
const char *filename;
 | 
						|
 | 
						|
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 | 
						|
                   PSTR cmdline, int iCmdShow)
 | 
						|
{
 | 
						|
    static char appname[] = "OpenSSL";
 | 
						|
    HWND hwnd;
 | 
						|
    MSG msg;
 | 
						|
    WNDCLASSEX wndclass;
 | 
						|
    char buffer[200];
 | 
						|
 | 
						|
    if (cmdline[0] == '\0')
 | 
						|
        filename = RAND_file_name(buffer, sizeof buffer);
 | 
						|
    else
 | 
						|
        filename = cmdline;
 | 
						|
 | 
						|
    RAND_load_file(filename, -1);
 | 
						|
 | 
						|
    wndclass.cbSize = sizeof(wndclass);
 | 
						|
    wndclass.style = CS_HREDRAW | CS_VREDRAW;
 | 
						|
    wndclass.lpfnWndProc = WndProc;
 | 
						|
    wndclass.cbClsExtra = 0;
 | 
						|
    wndclass.cbWndExtra = 0;
 | 
						|
    wndclass.hInstance = hInstance;
 | 
						|
    wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
 | 
						|
    wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
 | 
						|
    wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
 | 
						|
    wndclass.lpszMenuName = NULL;
 | 
						|
    wndclass.lpszClassName = appname;
 | 
						|
    wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
 | 
						|
    RegisterClassEx(&wndclass);
 | 
						|
 | 
						|
    hwnd = CreateWindow(appname, OPENSSL_VERSION_TEXT,
 | 
						|
                        WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT,
 | 
						|
                        CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance,
 | 
						|
                        NULL);
 | 
						|
 | 
						|
    ShowWindow(hwnd, iCmdShow);
 | 
						|
    UpdateWindow(hwnd);
 | 
						|
 | 
						|
    while (GetMessage(&msg, NULL, 0, 0)) {
 | 
						|
        TranslateMessage(&msg);
 | 
						|
        DispatchMessage(&msg);
 | 
						|
    }
 | 
						|
 | 
						|
    return msg.wParam;
 | 
						|
}
 | 
						|
 | 
						|
LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 | 
						|
{
 | 
						|
    HDC hdc;
 | 
						|
    PAINTSTRUCT ps;
 | 
						|
    RECT rect;
 | 
						|
    static int seeded = 0;
 | 
						|
 | 
						|
    switch (iMsg) {
 | 
						|
    case WM_PAINT:
 | 
						|
        hdc = BeginPaint(hwnd, &ps);
 | 
						|
        GetClientRect(hwnd, &rect);
 | 
						|
        DrawText(hdc, "Seeding the PRNG. Please move the mouse!", -1,
 | 
						|
                 &rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER);
 | 
						|
        EndPaint(hwnd, &ps);
 | 
						|
        return 0;
 | 
						|
 | 
						|
    case WM_DESTROY:
 | 
						|
        PostQuitMessage(0);
 | 
						|
        return 0;
 | 
						|
    }
 | 
						|
 | 
						|
    if (RAND_event(iMsg, wParam, lParam) == 1 && seeded == 0) {
 | 
						|
        seeded = 1;
 | 
						|
        if (RAND_write_file(filename) <= 0)
 | 
						|
            MessageBox(hwnd, "Couldn't write random file!",
 | 
						|
                       "OpenSSL", MB_OK | MB_ICONERROR);
 | 
						|
        PostQuitMessage(0);
 | 
						|
    }
 | 
						|
 | 
						|
    return DefWindowProc(hwnd, iMsg, wParam, lParam);
 | 
						|
}
 |