PGP: Unit tests: Add tests for binary public key, fix pgp file names

Signature "repod.xml_bad.asc" was in binary format. Therefore, the file
extension was changed to ".sig".
Files in ASCII Armored format have were renamed to have an ".asc"
extension.

Author: jrohel

tests/test_data/repo_yum_01/repodata/generator.sh

@@ -16,10 +16,12 @@ SUBKEY_KEYID=`gpg -k --with-colons | grep sub | cut -d: -f5`
 SUBKEY_FP=`gpg -k --with-colons | grep fpr | tail -n1 | cut -d: -f10`
 SUBKEY_CREATION=`gpg -k --with-colons | grep sub | cut -d: -f6`
 
-gpg --batch --passphrase '' --armor --export-secret-key "$USERID" > repomd.xml.key.secret
-gpg --batch --armor --export "$USERID" > repomd.xml.key
+gpg --batch --passphrase '' --armor --export-secret-key "$USERID" >repomd.xml.private-key.asc
+gpg --batch --armor --export "$USERID" >repomd.xml.key.asc
+gpg --batch --dearmor <repomd.xml.key.asc >repomd.xml.key
 mv repomd.xml.asc repomd.xml.asc~
 gpg --batch --armor --sign --detach -o repomd.xml.asc repomd.xml
+gpg --batch --dearmor <repomd.xml.asc >repomd.xml.sig 
 
 echo "Adjust test_gpg.c with these values:"
 echo

tests/test_data/repo_yum_01/repodata/repomd.xml.key

@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBGQCK4MBCACmfps+HeGv3BnrFmOO5PGPFDgQ0KtmSkfkrw8Sf3dcsfiMS9II
+2AOJNLd8NOgOkGGlyymrrf/FKPWnQHQDKxLgOuZ0FvAIfb+VNTjnuj8TfO94y7n1
+VpCu7oRKOQLfmRd3OQDe0CofNjYeYKn2l/an/x80o3ikoFMEdHcOkdhPkm/Kf5oc
+bJYVvxb81vvtsEOV5/+ybCpJIxXhk1y3DBBhaZGfEYOy9oF5/w2ZmL+mbLQ6KVlK
+euTDlADLv3KAtGALy1E/ZHANChPc372JI7osKT6MhRr1fItY6NCFSgXapDtea0x0
+sZj6LvOuWISZ5n+YoTM+loMgxjFHXEd7nV93ABEBAAG0NXJlcG9zaXRvcnkgc2ln
+bmluZyBrZXkgKHRlc3Qga2V5KSA8bm9vbmVAZXhhbXBsZS5vcmc+iQFOBBMBCgA4
+FiEE9PxbasWGlgI7nb+xl723kGRB7fUFAmQCK4MCGwMFCwkIBwIGFQoJCAsCBBYC
+AwECHgECF4AACgkQl723kGRB7fUC7Af/YSwbvM2xsjK947FOmVfX63qf5v2fRI7Q
+CEil6X8uZw5UXEvqsGDZCqmhYKSKlNnuky392D0/Kp0h3KCJ7KHA9/SCHrnl2PN4
+nenX5xunwJd3mhGOtLR2WSYXLBlG5Dh6bkDsWEaR8OPC8rSNNM9OfuuXMWf0OF91
+WYwleixUrfMbX9gVKozFzGv/yAospsJ0F48Z3RW+XROYLwbk72G6jXR0hkB1zEpN
+gwbpldxQFEagBDNwpvCF8jlwCOLjOQWM3oTx4YUdG4gAEGDKLsJcv4cMTaEUCr0r
+FEIHRcFCox7P4f9UFlIUNLj6zWNP9Nr3Yuqfh4bdYJfWE9kK271NErkBDQRkAiuD
+AQgAxjdpqh4z8wcURkon/bdxLKeI1weKYEdprNrEEHLlk5hV+qQ5dHtUCHBcf2sH
+kAwG4S3s4WAVoNyFP2l1gC5eM6/J/t1K5UgKEsDdCcVQMO1hA+T6breCLGTyS3Ut
+Qes/EZloe+zUjH8covZQwQJFuZp5xVaTVK/7IjYzL/zUK6ySjbXGU4W/iYGV07Je
+1W401uCwc3nosjptXgmc6Nhawn6U+I5tgPgX4L8hI3tla+fsiUpDD+Xlz3m90f8w
+4baHRSajB4b6Llu963JSTUE5tKfmxVVfHbKTe2Y5Nf6coJXfFxy3UuFDTUfK5S/C
+rIwB+ZoahvjfhC6eg7gh4LNnawARAQABiQE2BBgBCgAgFiEE9PxbasWGlgI7nb+x
+l723kGRB7fUFAmQCK4MCGwwACgkQl723kGRB7fV9Dgf9GvTNb36IxIOhyqWFFXZp
+C3NqyyIbRZ6KEXUzLaC88fx2hK1BQkeDASUS0HxccCCdjR1zesk0QfZtGJxVQFw+
+AyLWzMGRLDfMvXYRLzjYowYJ++beVadt/EfPzRHckunW75PLHrDd89Hur92r4ikK
+42GA3ZDPr9yggpnYvsAXt25lDx37HN3SeVds2Gb6wA01Vo6jXVKQGhRgk9K5T8dB
+szn12XdPGxhzo1HXPUFWwSi8SODpG+MkC+IGOrFzPHW5R5kOO7+nbALjzLWSrcfw
+zLiMgTqA0Z2O8QcTGSQ7jYQhSaWguWzhT1LsZ0/9xNGSHyWfYkYtXPAogB50qlvM
+LQ==
+=RI7R
+-----END PGP PUBLIC KEY BLOCK-----

tests/test_data/repo_yum_01/repodata/repomd.xml.key.asc

@@ -26,17 +26,17 @@ START_TEST(test_gpg_check_signature)
 
     tmp_home_path = lr_gettmpdir();
     key_path = lr_pathconcat(test_globals.testdata_dir,
-                             "repo_yum_01/repodata/repomd.xml.key", NULL);
+                             "repo_yum_01/repodata/repomd.xml.key.asc", NULL);
     _key_path = lr_pathconcat(test_globals.testdata_dir,
-                             "repo_yum_01/repodata/repomd.xml_bad.key", NULL);
+                             "repo_yum_01/repodata/repomd.xml_bad.key.asc", NULL);
     data_path = lr_pathconcat(test_globals.testdata_dir,
                              "repo_yum_01/repodata/repomd.xml", NULL);
     _data_path = lr_pathconcat(test_globals.testdata_dir,
                              "repo_yum_01/repodata/repomd.xml_bad", NULL);
     signature_path = lr_pathconcat(test_globals.testdata_dir,
                              "repo_yum_01/repodata/repomd.xml.asc", NULL);
     _signature_path = lr_pathconcat(test_globals.testdata_dir,
-                             "repo_yum_01/repodata/repomd.xml_bad.asc", NULL);
+                             "repo_yum_01/repodata/repomd.xml_bad.sig", NULL);
 
     // Import the first key directly from the file
     ret = lr_gpg_import_key(key_path, tmp_home_path, &tmp_err);
@@ -124,16 +124,14 @@ START_TEST(test_gpg_check_signature)
 }
 END_TEST
 
-START_TEST(test_gpg_check_key_export)
+
+static void check_key_import_test_export(const char *key_path)
 {
     gboolean ret;
-    char *key_path;
     char *tmp_home_path;
     GError *tmp_err = NULL;
 
     tmp_home_path = lr_gettmpdir();
-    key_path = lr_pathconcat(test_globals.testdata_dir,
-                             "repo_yum_01/repodata/repomd.xml.key", NULL);
 
     // Import the key from file descriptor
     int key_fd = open(key_path, O_RDONLY);
@@ -227,9 +225,24 @@ START_TEST(test_gpg_check_key_export)
 
     lr_gpg_keys_free(keys);
     lr_remove_dir(tmp_home_path);
-    lr_free(key_path);
     g_free(tmp_home_path);
 }
+
+
+START_TEST(test_gpg_check_armored_key_import_test_export)
+{
+    char *key_path = lr_pathconcat(test_globals.testdata_dir, "repo_yum_01/repodata/repomd.xml.key.asc", NULL);
+    check_key_import_test_export(key_path);
+    lr_free(key_path);
+}
+END_TEST
+
+START_TEST(test_gpg_check_binary_key_import_test_export)
+{
+    char *key_path = lr_pathconcat(test_globals.testdata_dir, "repo_yum_01/repodata/repomd.xml.key", NULL);
+    check_key_import_test_export(key_path);
+    lr_free(key_path);
+}
 END_TEST
 
 
@@ -239,7 +252,8 @@ gpg_suite(void)
     Suite *s = suite_create("gpg");
     TCase *tc = tcase_create("Main");
     tcase_add_test(tc, test_gpg_check_signature);
-    tcase_add_test(tc, test_gpg_check_key_export);
+    tcase_add_test(tc, test_gpg_check_armored_key_import_test_export);
+    tcase_add_test(tc, test_gpg_check_binary_key_import_test_export);
     suite_add_tcase(s, tc);
     return s;
 }