From owner-svn-ports-head@freebsd.org Wed Oct 31 22:52:32 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1162F10EBBC4; Wed, 31 Oct 2018 22:52:32 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-vs1-f48.google.com (mail-vs1-f48.google.com [209.85.217.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B145F6F471; Wed, 31 Oct 2018 22:52:31 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: by mail-vs1-f48.google.com with SMTP id x64so4389974vsa.5; Wed, 31 Oct 2018 15:52:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xgcwlblP5jTHTqYiyLIYXVVKvBiO/b9/8jDmUXdCFDg=; b=KvbtgfokgaC9JwcggHzSk5/Nlb73j89vYe97BZToJ7aYXsy/RhMlhoT4YVaHFkkZSF i8LvnUbLqIFfgEyR5poi7q4Q9MNqtrVJVa22EtYYZ5SWc9Yl3mgqZs4/86qX+Y/g5Zbv kccmUb50xKvGxo0Z/0mgKrJ0TVmI7VDFOwycviX2BkzGbEXzc8gduGmy+L/tmI/uQiOJ ruJVmYj6VrMBJ162vrJTiTOo4o77xHftRpkAEWO4FgauhjauOAeVTFGLlaCrbCryePLq RS7oceyuDAzhghZyxdLNC18AAmwZo0b2gE2Ucql6RmxqxEl3Dgu3bPJ5KK9Tx7P+xsMQ ZRQg== X-Gm-Message-State: AGRZ1gJLVrEF0ZIRrF0K/j5I1CUv1Xa1aU537psIiANACpkjRWwNVF9x pAcd7qMbjOH4eofFQr7WHXKGvP8L77nshczkKzPOmh6P X-Google-Smtp-Source: AJdET5dlGKs9kXbqVc6JNUYuw4j8W/33ZbpATrUxzeNI17PnIfGDjHcio00/ICPtMYpax/bC3RPKIObt+JI8kqFYjFo= X-Received: by 2002:a67:3ad6:: with SMTP id g83mr2232450vsi.120.1541025921426; Wed, 31 Oct 2018 15:45:21 -0700 (PDT) MIME-Version: 1.0 References: <201810120735.w9C7ZlgE052626@repo.freebsd.org> <20181028104811.GB20356@FreeBSD.org> In-Reply-To: <20181028104811.GB20356@FreeBSD.org> From: "Jason E. Hale" Date: Wed, 31 Oct 2018 18:45:10 -0400 Message-ID: Subject: Re: svn commit: r481881 - in head/archivers/libunrar5: . files To: Alexey Dokuchaev Cc: "Jason E. Hale" , ports-committers , svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2018 22:52:32 -0000 On Sun, Oct 28, 2018 at 6:48 AM Alexey Dokuchaev wrote: > > On Fri, Oct 12, 2018 at 07:35:47AM +0000, Jason E. Hale wrote: > > New Revision: 481881 > > URL: https://svnweb.freebsd.org/changeset/ports/481881 > > > > Log: > > Fix build with OpenSSL 1.1.x > > > > Reported by: pkg-fallout (head) > > > > ... > > ++#if OPENSSL_VERSION_NUMBER < 0x10100000L > > + EVP_CIPHER_CTX_init(&ctx); > > + EVP_CipherInit_ex(&ctx, cipher, NULL, key, initVector, Encrypt); > > + EVP_CIPHER_CTX_set_padding(&ctx, 0); > > Shouldn't it read 0x10100005L instead? > > > class Rijndael > > { > > private: > > +#ifdef OPENSSL_AES > > ++#if OPENSSL_VERSION_NUMBER < 0x10100000L > > + EVP_CIPHER_CTX ctx; > > ++#else > > ++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); > > ++#endif > > This looks fishy; I think EVP_CIPHER_CTX_new() should be called in ctor and > EVP_CIPHER_CTX_free() in dtor (the latter is missing altogether). > You're probably right. I just synced the patches with those in archivers/unrar which uses the same source code. I will investigate it further. Thanks! - Jason