* more details.
*
* You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <fcntl.h>
#include <sys/stat.h>
#include <unistd.h>
+#include "build-config.h"
+
#include "armor.h"
#include "charfuncs.h"
#include "cleankey.h"
#include "onak-conf.h"
#include "parsekey.h"
#include "photoid.h"
-#include "version.h"
void find_keys(struct onak_dbctx *dbctx,
char *search, uint64_t keyid,
logthing(LOGTHING_INFO, "Finished reading %d keys.",
result);
- result = cleankeys(keys);
+ result = cleankeys(&keys, config.clean_policies);
logthing(LOGTHING_INFO, "%d keys cleaned.",
result);
result);
if (keys != NULL) {
- result = cleankeys(keys);
+ result = cleankeys(&keys,
+ config.clean_policies);
logthing(LOGTHING_INFO, "%d keys cleaned.",
result);
free_publickey(keys);
keys = NULL;
}
+ } else if (!strcmp("dumpconfig", argv[optind])) {
+ if ((argc - optind) == 2) {
+ writeconfig(argv[optind + 1]);
+ } else {
+ /* Dump config to stdout */
+ writeconfig(NULL);
+ }
} else if ((argc - optind) == 2) {
search = argv[optind+1];
if (search != NULL && strlen(search) == 42 &&
search[0] == '0' && search[1] == 'x') {
- fingerprint.length = MAX_FINGERPRINT_LEN;
- for (i = 0; i < MAX_FINGERPRINT_LEN; i++) {
+ /* v4 fingerprint */
+ fingerprint.length = 20;
+ for (i = 0; i < 20; i++) {
+ fingerprint.fp[i] =
+ (hex2bin(search[2 + i * 2]) << 4) +
+ hex2bin(search[3 + i * 2]);
+ }
+ isfp = true;
+ } else if (search != NULL && strlen(search) == 66 &&
+ search[0] == '0' && search[1] == 'x') {
+ /* v5 fingerprint */
+ fingerprint.length = 32;
+ for (i = 0; i < 32; i++) {
fingerprint.fp[i] =
(hex2bin(search[2 + i * 2]) << 4) +
hex2bin(search[3 + i * 2]);
dbctx->starttrans(dbctx);
if (dbctx->fetch_key_id(dbctx, keyid, &keys, true)) {
dbctx->delete_key(dbctx, keyid, true);
- cleankeys(keys);
+ cleankeys(&keys, config.clean_policies);
dbctx->store_key(dbctx, keys, true, false);
} else {
puts("Key not found");