summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/usr.bin/openssl/apps.c4
-rw-r--r--src/usr.bin/openssl/x509.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c
index 8daf924f0f..ff14199f6e 100644
--- a/src/usr.bin/openssl/apps.c
+++ b/src/usr.bin/openssl/apps.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: apps.c,v 1.40 2016/09/04 09:00:14 guenther Exp $ */ 1/* $OpenBSD: apps.c,v 1.41 2016/12/30 16:28:53 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -619,7 +619,7 @@ load_cert(BIO *err, const char *file, int format, const char *pass,
619 x = d2i_X509_bio(cert, NULL); 619 x = d2i_X509_bio(cert, NULL);
620 else if (format == FORMAT_NETSCAPE) { 620 else if (format == FORMAT_NETSCAPE) {
621 NETSCAPE_X509 *nx; 621 NETSCAPE_X509 *nx;
622 nx = ASN1_item_d2i_bio(ASN1_ITEM_rptr(NETSCAPE_X509), 622 nx = ASN1_item_d2i_bio(&NETSCAPE_X509_it,
623 cert, NULL); 623 cert, NULL);
624 if (nx == NULL) 624 if (nx == NULL)
625 goto end; 625 goto end;
diff --git a/src/usr.bin/openssl/x509.c b/src/usr.bin/openssl/x509.c
index da5f2c37ea..3daea89141 100644
--- a/src/usr.bin/openssl/x509.c
+++ b/src/usr.bin/openssl/x509.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509.c,v 1.12 2015/10/17 15:00:11 doug Exp $ */ 1/* $OpenBSD: x509.c,v 1.13 2016/12/30 16:28:53 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -893,7 +893,7 @@ bad:
893 nx.header = &hdr; 893 nx.header = &hdr;
894 nx.cert = x; 894 nx.cert = x;
895 895
896 i = ASN1_item_i2d_bio(ASN1_ITEM_rptr(NETSCAPE_X509), out, &nx); 896 i = ASN1_item_i2d_bio(&NETSCAPE_X509_it, out, &nx);
897 } else { 897 } else {
898 BIO_printf(bio_err, "bad output format specified for outfile\n"); 898 BIO_printf(bio_err, "bad output format specified for outfile\n");
899 goto end; 899 goto end;