Attachment 3469 Details for Bug 3233 – more debugging

[patch] more debugging

moredebug.diff (text/plain), 2.00 KB, created by Damien Miller on 2021-02-04 09:23:03 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2021-02-04 09:23:03 AEDT

Size: 2.00 KB

patch

obsolete

>diff --git a/ssh-add.c b/ssh-add.c
>index 7edb9f9a..c3bc7200 100644
>--- a/ssh-add.c
>+++ b/ssh-add.c
>@@ -41,6 +41,7 @@
> #include <sys/stat.h>
> 
> #ifdef WITH_OPENSSL
>+# include <openssl/err.h>
> # include <openssl/evp.h>
> # include "openbsd-compat/openssl-compat.h"
> #endif
>@@ -260,9 +261,10 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag,
> 			return -1;
> 		}
> 	}
>+	ERR_load_crypto_strings();
> 	if ((r = sshbuf_load_fd(fd, &keyblob)) != 0) {
>-		fprintf(stderr, "Error loading key \"%s\": %s\n",
>-		    filename, ssh_err(r));
>+		fprintf(stderr, "%d: Error loading key \"%s\": %s\n",
>+		    __LINE__, filename, ssh_err(r));
> 		sshbuf_free(keyblob);
> 		close(fd);
> 		return -1;
>@@ -272,16 +274,16 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag,
> 	/* At first, try empty passphrase */
> 	if ((r = sshkey_parse_private_fileblob(keyblob, "", &private,
> 	    &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
>-		fprintf(stderr, "Error loading key \"%s\": %s\n",
>-		    filename, ssh_err(r));
>+		fprintf(stderr, "%d: Error loading key \"%s\": %s\n",
>+		    __LINE__, filename, ssh_err(r));
> 		goto fail_load;
> 	}
> 	/* try last */
> 	if (private == NULL && pass != NULL) {
> 		if ((r = sshkey_parse_private_fileblob(keyblob, pass, &private,
> 		    &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
>-			fprintf(stderr, "Error loading key \"%s\": %s\n",
>-			    filename, ssh_err(r));
>+			fprintf(stderr, "%d: Error loading key \"%s\": %s\n",
>+			    __LINE__, filename, ssh_err(r));
> 			goto fail_load;
> 		}
> 	}
>@@ -299,9 +301,11 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag,
> 				break;
> 			else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
> 				fprintf(stderr,
>-				    "Error loading key \"%s\": %s\n",
>-				    filename, ssh_err(r));
>+				    "%d: Error loading key \"%s\": %s\n",
>+				    __LINE__, filename, ssh_err(r));
>  fail_load:
>+				if (r == SSH_ERR_LIBCRYPTO_ERROR)
>+					ERR_print_errors_fp(stderr);
> 				clear_pass();
> 				sshbuf_free(keyblob);
> 				return -1;

Actions: View | Diff

Attachments on bug 3233: 3457 | 3469