 @@ -20,34 +20,27 @@
  */
 /**
  \file Command line program to perform openpgp operations
 */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
 #include <libgen.h>
 #include <unistd.h>
-#include <openpgpsdk/keyring.h>
+#include <openpgpsdk/openpgpsdk.h>
 #include <openpgpsdk/crypto.h>
 #include <openpgpsdk/signature.h>
 #include <openpgpsdk/validate.h>
 #include <openpgpsdk/readerwriter.h>
 #include <openpgpsdk/std_print.h>
 #include <openpgpsdk/packet-show.h>
 #include <openpgpsdk/util.h>
 #define DEFAULT_NUMBITS 2048
 #define MAXBUF 1024
 static const char *usage = "%s --list-keys | --list-packets | --encrypt | --decrypt | --sign | --clearsign | --verify [--keyring=<keyring>] [--userid=<userid>] [--armour] [--homedir=<homedir>] files...\n";
 static const char *usage_find_key = "%s --find-key --userid=<userid> [--keyring=<keyring>] \n";
 static const char *usage_export_key = "%s --export-key --userid=<userid> [--keyring=<keyring>] \n";
 static const char *usage_encrypt = "%s --encrypt --userid=<userid> [--armour] [--homedir=<homedir>] files...\n";
 static const char *usage_sign = "%s --sign --userid=<userid> [--armour] [--homedir=<homedir>] files...\n";
 static const char *usage_clearsign = "%s --clearsign --userid=<userid> [--homedir=<homedir>] files...\n";
 static char    *pname;
 @@ -55,26 +48,27 @@ static char    *pname;
 enum optdefs {
 	/* commands */
 	LIST_KEYS = 1,
 	FIND_KEY,
 	EXPORT_KEY,
 	IMPORT_KEY,
 	GENERATE_KEY,
 	ENCRYPT,
 	DECRYPT,
 	SIGN,
 	CLEARSIGN,
 	VERIFY,
 	LIST_PACKETS,
 	VERSION,
 	/* options */
 	KEYRING,
 	USERID,
 	PASSPHRASE,
 	ARMOUR,
 	HOMEDIR,
 	NUMBITS,
 	/* debug */
 	OPS_DEBUG
 };
 @@ -92,26 +86,28 @@ static struct option long_options[] = {
 	{"find-key", no_argument, NULL, FIND_KEY},
 	{"export-key", no_argument, NULL, EXPORT_KEY},
 	{"import-key", no_argument, NULL, IMPORT_KEY},
 	{"generate-key", no_argument, NULL, GENERATE_KEY},
 	{"encrypt", no_argument, NULL, ENCRYPT},
 	{"decrypt", no_argument, NULL, DECRYPT},
 	{"sign", no_argument, NULL, SIGN},
 	{"clearsign", no_argument, NULL, CLEARSIGN},
 	{"verify", no_argument, NULL, VERIFY},
 	{"list-packets", no_argument, NULL, LIST_PACKETS},
 	{"version", no_argument, NULL, VERSION},
 	/* options */
 	{"keyring", required_argument, NULL, KEYRING},
 	{"userid", required_argument, NULL, USERID},
 	{"passphrase", required_argument, NULL, PASSPHRASE},
 	{"homedir", required_argument, NULL, HOMEDIR},
 	{"armor", no_argument, NULL, ARMOUR},
 	{"armour", no_argument, NULL, ARMOUR},
 	{"numbits", required_argument, NULL, NUMBITS},
 	/* debug */
 	{"debug", required_argument, NULL, OPS_DEBUG},
 	{ NULL, 0, NULL, 0},
 @@ -448,26 +444,30 @@ main(int argc, char **argv)
 		case FIND_KEY:
 		case EXPORT_KEY:
 		case IMPORT_KEY:
 		case GENERATE_KEY:
 		case ENCRYPT:
 		case DECRYPT:
 		case SIGN:
 		case CLEARSIGN:
 		case VERIFY:
 		case LIST_PACKETS:
 			p.cmd = long_options[optindex].val;
 			break;
 		case VERSION:
 			printf("%s version: %s\n", *argv, ops_get_version());
 			exit(EXIT_SUCCESS);
 			/* option */
 		case KEYRING:
 			if (optarg == NULL) {
 				(void) fprintf(stderr, "No keyring argument provided\n");
 				exit(EXIT_ERROR);
+			}
 			snprintf(p.keyring, MAXBUF, "%s", optarg);
 			break;
 		case USERID:
 			if (optarg == NULL) {
 				(void) fprintf(stderr, "No userid argument provided\n");

 @@ -532,27 +532,29 @@ ops_rsa_private_decrypt(unsigned char *o
 	orsa->n = rsa->n;	/* XXX: do we need n? */
 	orsa->d = srsa->d;
 	orsa->p = srsa->q;
 	orsa->q = srsa->p;
 	/* debug */
 	orsa->e = rsa->e;
 	assert(RSA_check_key(orsa) == 1);
 	orsa->e = NULL;
 	/* end debug */
 	n = RSA_private_decrypt(length, in, out, orsa, RSA_NO_PADDING);
-	/* printf("ops_rsa_private_decrypt: n=%d\n",n); */
+	if (ops_get_debug_level(__FILE__)) {
 		printf("ops_rsa_private_decrypt: n=%d\n",n);
+	}
 	errbuf[0] = '\0';
 	if (n == -1) {
 		unsigned long   err = ERR_get_error();
 		ERR_error_string(err, &errbuf[0]);
 		fprintf(stderr, "openssl error : %s\n", errbuf);
+	}
 	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
 	RSA_free(orsa);
 	return n;
+}

 @@ -43,18 +43,24 @@ void            hexdump(const unsigned c
 #ifndef CHECKED_PTR_OF
 #define CHECKED_PTR_OF(type, p) ((void*) (1 ? p : (type *)0))
 #endif
 #define CHECKED_INSTANCE_OF(type, p) (1 ? p : (type)0)
 /* number of elements in an array */
 #define OPS_ARRAY_SIZE(a)	(sizeof(a)/sizeof(*(a)))
 const char     *ops_str_from_map(int, ops_map_t *);
 int             ops_set_debug_level(const char *);
 int             ops_get_debug_level(const char *);
 #ifndef PACKAGE_VERSION
 #define PACKAGE_VERSION	"20090201"
 #endif
 const char     *ops_get_version(void);
 #ifndef __UNCONST
 #define __UNCONST(a)   ((void *)(unsigned long)(const void *)(a))
 #endif
 #endif

 @@ -229,13 +229,20 @@ ops_get_debug_level(const char *f)
 	if ((name = strrchr(f, '/')) == NULL) {
 		name = f;
 	} else {
 		name += 1;
+	}
 	for (i = 0; i < debugc; i++) {
 		if (strcmp(debugv[i], "all") == 0 ||
 		    strcmp(debugv[i], name) == 0) {
 			return 1;
+		}
+	}
 	return 0;
+}
 /* return the version for the library */
 const char *
 ops_get_version(void)
+{
 	return PACKAGE_VERSION;
+}