From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5E3D546BC1 for ; Tue, 4 Jul 2023 20:41:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81AFE68C54B; Tue, 4 Jul 2023 23:41:48 +0300 (EEST) Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7186F68C52E for ; Tue, 4 Jul 2023 23:41:42 +0300 (EEST) Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-19674cab442so5285350fac.3 for ; Tue, 04 Jul 2023 13:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688503300; x=1691095300; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=0w58eIFbTXHLvPpOFxSqsoaxrUZZ6g9+uoNqSMHUjHc=; b=b+lCZYDcA3jjZcb975FYC03vLUdZiCfMzWW3FrF1QRnOEGJ1VfMZRYdFgG0dqdzAPW miSSkeoFJo/9h/Z3WTlBer2NKkGp74F7FFEFPDUpRMDDVkePCnmYd6BsJxKWc29Feygt 36d0ooISGBZ7qgdWnXODjRoL744+kM8sMsCNlfBIaCVp7ovakycAMGZ7x68tivaROfqU 9EvNM/Gcx9Nz73bWycCiRLdvmS3MzYcYAFmMhJbEEVfdygmBS5e73hSeiC3lfitc3BEp u2KrHQPS8wnkRGY7IcNUyTcPzoSOd+Al9Bwr90GhK+A475I08m3D+qVp3/O4YevnhcYO VLWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688503300; x=1691095300; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0w58eIFbTXHLvPpOFxSqsoaxrUZZ6g9+uoNqSMHUjHc=; b=f0bUNJEOZtoFL+Rn6oSWzcX0mByXraU7hB4MX14WaZtq6OE9/8MJb6MGP5t1FqqKIG Cx0rnOjrnYJNWYiYWmBQXqThOHVj/x9I/9sWXgg5+tTzU8cCeH3Rq/Z4MVrtS6oX8la+ hzG0CMzA9xrXaNon28ZHtTRcxcBUc37tALNM/XdeS4qt6+PKkttfR5Z2rbkCLlrQfuIF mcJ/hZwzJkG9dvBxk0JvgYeovLkWguknms5fFCXisOl8XC4BO529OSHPK7aD2cKnbo/9 gWdJ6UIkjOls0YT1jz2JD3bmZY4aCjaFXhB0vQAzeOVOGr0Sr80SzVgZjFENE89mq8pv nxdw== X-Gm-Message-State: ABy/qLauYSSlKhPUzEToVQ5aejCXrjJggf/V/Go5mPg7awmSqoe5bwxr jKQLoUFqhDYVG/+HpVaYhptBnXVHKOc= X-Google-Smtp-Source: APBJJlEDyFFp+jyxVYhR6hhJ4xM3wxuolgZ3plYgByluFndXUpVQsmJElvPBEJcsJAQHLytDDVn1Qg== X-Received: by 2002:a05:6870:ab0c:b0:1b3:d51a:4404 with SMTP id gu12-20020a056870ab0c00b001b3d51a4404mr2263393oab.56.1688503299817; Tue, 04 Jul 2023 13:41:39 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id m16-20020a056870a41000b001a68feb9440sm14369827oal.9.2023.07.04.13.41.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 13:41:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jul 2023 17:41:27 -0300 Message-ID: <20230704204128.2510-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] avutil/random_seed: add av_random() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Uses the existing code for av_get_random_seed() to return a buffer with cryptographically secure random data, or an error if none could be generated. Signed-off-by: James Almer --- libavutil/random_seed.c | 54 ++++++++++++++++++++++++++++------------- libavutil/random_seed.h | 12 +++++++++ 2 files changed, 49 insertions(+), 17 deletions(-) diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c index 66dd504ef0..0ed8f89cc6 100644 --- a/libavutil/random_seed.c +++ b/libavutil/random_seed.c @@ -46,20 +46,22 @@ #define TEST 0 #endif -static int read_random(uint32_t *dst, const char *file) -{ #if HAVE_UNISTD_H +static int read_random(uint8_t *dst, size_t len, const char *file) +{ int fd = avpriv_open(file, O_RDONLY); - int err = -1; + ssize_t err = -1; + if (len > SSIZE_MAX) + return -1; if (fd == -1) return -1; - err = read(fd, dst, sizeof(*dst)); + err = read(fd, dst, len); close(fd); + if (err == -1) + return AVERROR(errno); - return err; -#else - return -1; + return err == len; #endif } @@ -118,29 +120,47 @@ static uint32_t get_generic_seed(void) return AV_RB32(digest) + AV_RB32(digest + 16); } -uint32_t av_get_random_seed(void) +int av_random(uint8_t* buf, size_t len) { - uint32_t seed; + int err = AVERROR_UNKNOWN; #if HAVE_BCRYPT BCRYPT_ALG_HANDLE algo_handle; NTSTATUS ret = BCryptOpenAlgorithmProvider(&algo_handle, BCRYPT_RNG_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); if (BCRYPT_SUCCESS(ret)) { - NTSTATUS ret = BCryptGenRandom(algo_handle, (UCHAR*)&seed, sizeof(seed), 0); + NTSTATUS ret = BCryptGenRandom(algo_handle, (PUCHAR)buf, len, 0); BCryptCloseAlgorithmProvider(algo_handle, 0); if (BCRYPT_SUCCESS(ret)) - return seed; + return 0; } #endif #if HAVE_ARC4RANDOM - return arc4random(); + arc4random_buf(buf, len); + return 0; +#endif + +#if HAVE_UNISTD_H + err = read_random(buf, len, "/dev/urandom"); + if (err == 1) + return 0; + err = read_random(buf, len, "/dev/random"); + if (err == 1) + return 0; + if (err == 0) + err = AVERROR_UNKNOWN; #endif - if (read_random(&seed, "/dev/urandom") == sizeof(seed)) - return seed; - if (read_random(&seed, "/dev/random") == sizeof(seed)) - return seed; - return get_generic_seed(); + return err; +} + +uint32_t av_get_random_seed(void) +{ + uint32_t seed; + + if (av_random((uint8_t *)&seed, sizeof(seed)) < 0) + return get_generic_seed(); + + return seed; } diff --git a/libavutil/random_seed.h b/libavutil/random_seed.h index 0462a048e0..ce982bb82f 100644 --- a/libavutil/random_seed.h +++ b/libavutil/random_seed.h @@ -36,6 +36,18 @@ */ uint32_t av_get_random_seed(void); +/** + * Generate cryptographically secure random data, i.e. suitable for use as + * encryption keys and similar. + * + * @param buf buffer into which the random data will be written + * @param len size of buf in bytes + * + * @retval 0 success, and len bytes of random data was written into buf, or + * a negative AVERROR code if random data could not be generated. + */ +int av_random(uint8_t* buf, size_t len); + /** * @} */ -- 2.41.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".