socsvn commit: r294539 - in soc2013/def/crashdump-head/sbin: decryptcore dumpon

def at FreeBSD.org def at FreeBSD.org
Sun Nov 29 16:44:27 UTC 2015


Author: def
Date: Sun Nov 29 16:44:26 2015
New Revision: 294539
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=294539

Log:
  Fix message format for OpenSSL errors.

Modified:
  soc2013/def/crashdump-head/sbin/decryptcore/decryptcore.c
  soc2013/def/crashdump-head/sbin/dumpon/dumpon.c

Modified: soc2013/def/crashdump-head/sbin/decryptcore/decryptcore.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/decryptcore/decryptcore.c	Sun Nov 29 16:34:53 2015	(r294538)
+++ soc2013/def/crashdump-head/sbin/decryptcore/decryptcore.c	Sun Nov 29 16:44:26 2015	(r294539)
@@ -166,7 +166,7 @@
 
 	privkey = RSA_new();
 	if (privkey == NULL) {
-		pjdlog_error("Unable to allocate an RSA structure. %s",
+		pjdlog_error("Unable to allocate an RSA structure: %s",
 		    ERR_error_string(ERR_get_error(), NULL));
 		goto failed;
 	}
@@ -195,7 +195,7 @@
 	if (RSA_private_decrypt(kdk->kdk_encryptedkeysize,
 	    kdk->kdk_encryptedkey, key, privkey,
 	    RSA_PKCS1_PADDING) != sizeof(key)) {
-		pjdlog_error("Unable to decrypt key. %s",
+		pjdlog_error("Unable to decrypt key: %s",
 		    ERR_error_string(ERR_get_error(), NULL));
 		goto failed;
 	}

Modified: soc2013/def/crashdump-head/sbin/dumpon/dumpon.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/dumpon/dumpon.c	Sun Nov 29 16:34:53 2015	(r294538)
+++ soc2013/def/crashdump-head/sbin/dumpon/dumpon.c	Sun Nov 29 16:44:26 2015	(r294539)
@@ -125,7 +125,7 @@
 
 	pubkey = RSA_new();
 	if (pubkey == NULL) {
-		warnx("Unable to allocate an RSA structure. %s",
+		warnx("Unable to allocate an RSA structure: %s",
 		    ERR_error_string(ERR_get_error(), NULL));
 		goto failed;
 	}


More information about the svn-soc-all mailing list