diff options
author | Norbert Preining <norbert@preining.info> | 2020-09-20 03:03:26 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-09-20 03:03:26 +0000 |
commit | 1f457376b478257b88d4a857f5ec1b6155442dd7 (patch) | |
tree | 2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/dk3appr.c | |
parent | ac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff) |
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk3appr.c')
-rw-r--r-- | support/dktools/dk3appr.c | 65 |
1 files changed, 17 insertions, 48 deletions
diff --git a/support/dktools/dk3appr.c b/support/dktools/dk3appr.c index ae661e85c4..31fd8098f3 100644 --- a/support/dktools/dk3appr.c +++ b/support/dktools/dk3appr.c @@ -1,36 +1,14 @@ /* - WARNING: This file was generated by dkct. - Changes you make here will be lost if dkct is run again! - You should modify the original source and run dkct on it. - Original source: dk3appr.ctr +Copyright (C) 2011-2020, Dirk Krause +SPDX-License-Identifier: BSD-3-Clause */ /* -Copyright (C) 2011-2017, Dirk Krause - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above opyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -* Neither the name of the author nor the names of contributors may be used - to endorse or promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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. + WARNING: This file was generated by the dkct program (see + http://dktools.sourceforge.net/ for details). + Changes you make here will be lost if dkct is run again! + You should modify the original source and run dkct on it. + Original source: dk3appr.ctr */ /** @file dk3appr.c The dk3appr module. @@ -652,12 +630,11 @@ dk3app_rand_init(dk3_app_t *app, dkChar const *il) @param app Application structure. @param db Destination buffer. @param sz Size of \a db (number of bytes). - @param f_crypto Flag: For cryptographic purposes. @return Number of bytes written to \a db. */ static size_t -dk3app_rand_bytes_internal(dk3_app_t *app, void *db, size_t sz, int f_crypto) +dk3app_rand_bytes_internal(dk3_app_t *app, void *db, size_t sz) { size_t back = 0; unsigned char *ucptr = NULL; @@ -672,14 +649,8 @@ dk3app_rand_bytes_internal(dk3_app_t *app, void *db, size_t sz, int f_crypto) switch(app->rand_type) { case DK3_PRNG_OPENSSL: { #if DK3_HAVE_OPENSSL_RAND_H - if(f_crypto) { - if(RAND_bytes(ucptr, (int)sz) == 1) { - back = sz; - } - } else { - if(RAND_pseudo_bytes(ucptr, (int)sz) > -1) { - back = sz; - } + if(RAND_bytes(ucptr, (int)sz) == 1) { + back = sz; } #else /* BUG: Not available! */ @@ -763,7 +734,7 @@ size_t dk3app_rand_bytes(dk3_app_t *app, void *db, size_t sz) { size_t back; - back = dk3app_rand_bytes_internal(app, db, sz, 1); + back = dk3app_rand_bytes_internal(app, db, sz); return back; } @@ -771,9 +742,7 @@ dk3app_rand_bytes(dk3_app_t *app, void *db, size_t sz) size_t dk3app_rand_bytes_non_crypto(dk3_app_t *app, void *db, size_t sz) { - size_t back; - back = dk3app_rand_bytes_internal(app, db, sz, 0); - return back; + return ( dk3app_rand_bytes(app, db, sz) ); } @@ -795,10 +764,10 @@ dk3app_rand_end(dk3_app_t *app) #endif -#line 709 "dk3appr.ctr" +#line 700 "dk3appr.ctr" if((app->f_rand_initialized) && (app->f_rand_success)) { -#line 710 "dk3appr.ctr" +#line 701 "dk3appr.ctr" switch(app->rand_type) { case DK3_PRNG_OPENSSL: { #if DK3_HAVE_OPENSSL_RAND_H @@ -821,7 +790,7 @@ dk3app_rand_end(dk3_app_t *app) dk3str_cat(fnb, p4); dk3str_cat(fnb, p5); -#line 731 "dk3appr.ctr" +#line 722 "dk3appr.ctr" fipo = dk3sf_fopen_app(fnb, dk3app_not_localized(24), app); if(fipo) { fclose(fipo); fipo = NULL; @@ -845,10 +814,10 @@ dk3app_rand_end(dk3_app_t *app) } } else { -#line 753 "dk3appr.ctr" +#line 744 "dk3appr.ctr" } -#line 754 "dk3appr.ctr" +#line 745 "dk3appr.ctr" } |