From e9032a3c566e9cec4858cc0ef7226c51772d9137 Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Wed, 15 Jul 2015 06:16:42 +0000
Subject: Make 'openssl pkeyutl -verify' return exit code 0 on success.

Previously, it returned '1' regardless of whether is succeeded or failed. This is now fixed in the OpenSSL master branch as well. Thanks to Kinichiro Inoguchi for pointing it out.

ok @deraadt
---
 src/usr.bin/openssl/pkeyutl.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/usr.bin/openssl/pkeyutl.c b/src/usr.bin/openssl/pkeyutl.c
index 0d1284988f..949f1538ef 100644
--- a/src/usr.bin/openssl/pkeyutl.c
+++ b/src/usr.bin/openssl/pkeyutl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkeyutl.c,v 1.4 2014/10/08 04:00:55 deraadt Exp $ */
+/* $OpenBSD: pkeyutl.c,v 1.5 2015/07/15 06:16:42 bcook Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -278,10 +278,11 @@ pkeyutl_main(int argc, char **argv)
 	if (pkey_op == EVP_PKEY_OP_VERIFY) {
 		rv = EVP_PKEY_verify(ctx, sig, (size_t) siglen,
 		    buf_in, (size_t) buf_inlen);
-		if (rv == 0)
-			BIO_puts(out, "Signature Verification Failure\n");
-		else if (rv == 1)
+		if (rv == 1) {
 			BIO_puts(out, "Signature Verified Successfully\n");
+			ret = 0;
+		} else
+			BIO_puts(out, "Signature Verification Failure\n");
 		if (rv >= 0)
 			goto end;
 	} else {
-- 
cgit v1.2.3-55-g6feb