Commit 710769f0 authored by Rich Salz's avatar Rich Salz
Browse files

Move FuzzerSetRand to separate file. 



Use an inline rand.inc; this fixes Google's OSS-Fuzz builds.

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/4141)
parent 5ff5f745

fuzz/asn1.c

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include <openssl/rand.h>

#include "fuzzer.h"



#include "rand.inc"



static ASN1_ITEM_EXP *item_type[] = {

    ASN1_ITEM_ref(ACCESS_DESCRIPTION),

#ifndef OPENSSL_NO_RFC3779

fuzz/client.c

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include <openssl/err.h>

#include "fuzzer.h"



#include "rand.inc"



/* unused, to avoid warning. */

static int idx;

fuzz/rand.inc

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL licenses, (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 * https://www.openssl.org/source/license.html

 * or in the file LICENSE in the source distribution.

 */

#include <openssl/rand.h>



static int fuzz_bytes(unsigned char *buf, int num)

{

    unsigned char val = 1;



    while (--num >= 0)

        *buf++ = val++;

    return 1;

}



static int fuzz_status(void)

{

    return 1;

}



static RAND_METHOD fuzz_rand_method = {

    NULL,

    fuzz_bytes,

    NULL,

    NULL,

    fuzz_bytes,

    fuzz_status

};



void FuzzerSetRand(void)

{

    RAND_set_rand_method(&fuzz_rand_method);

}

fuzz/server.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <openssl/err.h>

#include "fuzzer.h"



#include "rand.inc"



static const uint8_t kCertificateDER[] = {

    0x30, 0x82, 0x02, 0xff, 0x30, 0x82, 0x01, 0xe7, 0xa0, 0x03, 0x02, 0x01,

    0x02, 0x02, 0x11, 0x00, 0xb1, 0x84, 0xee, 0x34, 0x99, 0x98, 0x76, 0xfb,

fuzz/test-corpus.c

+0 −31
Original line number Diff line number Diff line
@@ -18,39 +18,8 @@ 
#include <stdlib.h>

#include <sys/stat.h>

#include <openssl/crypto.h>

#include <openssl/rand.h>

#include "fuzzer.h"



static int fuzz_bytes(unsigned char *buf, int num)

{

    unsigned char val = 1;



    while (--num >= 0)

        *buf++ = val++;

    return 1;

}



static int fuzz_status(void)

{

    return 1;

}



static RAND_METHOD fuzz_rand_method = {

    NULL,

    fuzz_bytes,

    NULL,

    NULL,

    fuzz_bytes,

    fuzz_status

};



void FuzzerSetRand(void)

{

    RAND_set_rand_method(&fuzz_rand_method);

}







int main(int argc, char **argv) {

    int n;