Attachment 202977 Details for Bug 236450 – Replace upper_bound with lower_bound in pgp_s2k #1854

[patch] Replace upper_bound with lower_bound in pgp_s2k #1854

botan2-2.9.0_1.diff (text/plain), 1.53 KB, created by Ralf van der Enden on 2019-03-19 08:43:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2019-03-19 08:43:56 UTC

Size: 1.53 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 496246)
>+++ Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	botan
> DISTVERSION=	2.9.0
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://botan.randombit.net/releases/
> PKGNAMESUFFIX=	2
>Index: files/patch-src_lib_pbkdf_pgp__s2k_pgp__s2k.cpp
>===================================================================
>--- files/patch-src_lib_pbkdf_pgp__s2k_pgp__s2k.cpp	(nonexistent)
>+++ files/patch-src_lib_pbkdf_pgp__s2k_pgp__s2k.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+https://github.com/randombit/botan/pull/1854
>+Replace upper_bound with lower_bound in pgp_s2k #1854
>+--- src/lib/pbkdf/pgp_s2k/pgp_s2k.cpp.orig	2019-01-04 11:14:58 UTC
>++++ src/lib/pbkdf/pgp_s2k/pgp_s2k.cpp
>+@@ -61,7 +61,7 @@ uint8_t RFC4880_encode_count(size_t desired_iterations
>+    if(desired_iterations >= OPENPGP_S2K_ITERS[255])
>+       return 255;
>+ 
>+-   auto i = std::upper_bound(OPENPGP_S2K_ITERS, OPENPGP_S2K_ITERS + 256, desired_iterations);
>++   auto i = std::lower_bound(OPENPGP_S2K_ITERS, OPENPGP_S2K_ITERS + 256, desired_iterations);
>+ 
>+    return static_cast<uint8_t>(i - OPENPGP_S2K_ITERS);
>+    }
>
>Property changes on: files/patch-src_lib_pbkdf_pgp__s2k_pgp__s2k.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

tremere: maintainer-approval+

Actions: View | Diff

Attachments on bug 236450: 202977 | 203287