[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / devel / eet / patches

File: [cvs.NetBSD.org] / pkgsrc / devel / eet / patches / Attic / patch-aa (download)

Revision 1.4, Wed Dec 7 15:15:53 2011 UTC (12 years, 2 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4
Changes since 1.3: +3 -3 lines

Fix merge error

$NetBSD: patch-aa,v 1.4 2011/12/07 15:15:53 joerg Exp $

--- src/lib/eet_cipher.c.orig	2011-11-21 02:09:15.000000000 +0000
+++ src/lib/eet_cipher.c
@@ -407,8 +407,18 @@ on_error:
    dh = EVP_PKEY_get1_DH(key->private_key);
    if (dh)
      {
+        BIO *b;
         fprintf(out, "Private key (DH):\n");
-        DHparams_print_fp(out, dh);
+        if ((b=BIO_new(BIO_s_file())) == NULL)
+          {
+            DHerr(DH_F_DHPARAMS_PRINT_FP,ERR_R_BUF_LIB);
+          }
+        else
+          {
+            BIO_set_fp(b, out, BIO_NOCLOSE);
+            DHparams_print(b, dh);
+            BIO_free(b);
+          }
      }
 
    fprintf(out, "Public certificate:\n");