openpgp-ffi: Change prefix from 'sq' to 'pgp'.

  - This change is the result of the following command, which can also
    be used to automatically convert existing users of Sequoia's C
    API:

        git grep -il sq_ | while read F ; do sed -E -i -e 's/sq_(arbitrary_writer_new|armor_reader_from_bytes|armor_reader_from_file|armor_reader_headers|armor_reader_kind|armor_reader_new|armor_writer_new|decrypt|encryptor_new|error_free|error_status|error_string|fingerprint_as_bytes|fingerprint_clone|fingerprint_equal|fingerprint_free|fingerprint_from_bytes|fingerprint_from_hex|fingerprint_hash|fingerprint_to_hex|fingerprint_to_keyid|fingerprint_to_string|keyid_clone|keyid_equal|keyid_free|keyid_from_bytes|keyid_from_hex|keyid_hash|keyid_to_hex|keyid_to_string|key_pair_as_signer|key_pair_free|key_pair_new|literal_writer_new|packet_free|packet_kind|packet_parser_buffer_unread_content|packet_parser_decrypt|packet_parser_eof_free|packet_parser_eof_is_message|packet_parser_finish|packet_parser_free|packet_parser_from_bytes|packet_parser_from_file|packet_parser_from_reader|packet_parser_next|packet_parser_packet|packet_parser_recurse|packet_parser_recursion_depth|packet_parser_result_eof|packet_parser_result_free|packet_parser_result_packet_parser|packet_parser_result_tag|packet_pile_clone|packet_pile_free|packet_pile_from_bytes|packet_pile_from_file|packet_pile_from_reader|packet_pile_serialize|packet_tag|pkesk_decrypt|pkesk_recipient|p_key_alive|p_key_alive_at|p_key_clone|p_key_creation_time|p_key_expired|p_key_expired_at|p_key_fingerprint|p_key_into_key_pair|p_key_keyid|p_key_public_key_algo|p_key_public_key_bits|reader_free|reader_from_bytes|reader_from_fd|reader_from_file|reader_read|revocation_status_free|revocation_status_variant|secret_cached|signature_alive|signature_alive_at|signature_can_authenticate|signature_can_certify|signature_can_encrypt_at_rest|signature_can_encrypt_for_transport|signature_can_sign|signature_expired|signature_expired_at|signature_free|signature_is_group_key|signature_is_split_key|signature_issuer|signature_issuer_fingerprint|signature_to_packet|signer_free|signer_new|signer_new_detached|skesk_decrypt|tag_to_string|tpk_alive|tpk_alive_at|tpk_builder_add_certification_subkey|tpk_builder_add_encryption_subkey|tpk_builder_add_signing_subkey|tpk_builder_add_userid|tpk_builder_autocrypt|tpk_builder_default|tpk_builder_free|tpk_builder_generate|tpk_builder_set_cipher_suite|tpk_clone|tpk_dump|tpk_equal|tpk_expired|tpk_expired_at|tpk_fingerprint|tpk_free|tpk_from_bytes|tpk_from_file|tpk_from_packet_parser|tpk_from_packet_pile|tpk_from_reader|tpk_into_tsk|tpk_is_tsk|tpk_key_iter|tpk_key_iter_free|tpk_key_iter_next|tpk_merge|tpk_merge_packets|tpk_primary|tpk_primary_user_id|tpk_revocation_status|tpk_revoke|tpk_revoke_in_place|tpk_serialize|tpk_set_expiry|tpk_user_id_binding_iter|tsk_free|tsk_into_tpk|tsk_new|tsk_serialize|tsk_tpk|user_attribute_value|user_id_binding_iter_free|user_id_binding_iter_next|user_id_binding_selfsig|user_id_binding_user_id|user_id_value|verification_result_code|verification_result_level|verification_results_at_level|verification_result_signature|verify|writer_alloc|writer_free|writer_from_bytes|writer_from_fd|writer_from_file|writer_stack_finalize|writer_stack_finalize_one|writer_stack_message|writer_stack_write|writer_stack_write_all|writer_write|reader|writer|packet_parser|packet_parser_result|packet_parser_eof|keyid|fingerprint|revocation_status|revocation_status_variant|armor_kind|armor_header|tag|unknown|signature|one_pass_sig|p_key|user_id|user_attribute|literal|compressed_data|pkesk|skesk|seip|mdc|packet|packet_pile|reason_for_revocation|user_id_binding|user_id_binding_iter|tpk_key_iter|tpk|tsk|tpk_builder|tpk_cipher_suite|public_key_algorithm|writer_stack|encryption_mode|secret|verification_results|verification_result|verification_result_code|sequoia_decrypt_get_public_keys_cb_t|sequoia_decrypt_get_secret_keys_cb_t|sequoia_decrypt_check_signatures_cb_t|mpi|signer|key_pair|p_key|status|error)/pgp_\1/g' -e 's/SQ_(ARMOR_KIND_ANY|ARMOR_KIND_FILE|ARMOR_KIND_FORCE_WIDTH|ARMOR_KIND_MESSAGE|ARMOR_KIND_PUBLICKEY|ARMOR_KIND_SECRETKEY|ARMOR_KIND_SIGNATURE|ENCRYPTION_MODE_AT_REST|ENCRYPTION_MODE_FOR_TRANSPORT|PUBLIC_KEY_ALGO_DSA|PUBLIC_KEY_ALGO_ECDH|PUBLIC_KEY_ALGO_ECDSA|PUBLIC_KEY_ALGO_EDDSA|PUBLIC_KEY_ALGO_ELGAMAL_ENCRYPT|PUBLIC_KEY_ALGO_ELGAMAL_ENCRYPT_SIGN|PUBLIC_KEY_ALGO_FORCE_WIDTH|PUBLIC_KEY_ALGO_RSA_ENCRYPT|PUBLIC_KEY_ALGO_RSA_ENCRYPT_SIGN|PUBLIC_KEY_ALGO_RSA_SIGN|REASON_FOR_REVOCATION_FORCE_WIDTH|REASON_FOR_REVOCATION_KEY_COMPROMISED|REASON_FOR_REVOCATION_KEY_RETIRED|REASON_FOR_REVOCATION_KEY_SUPERSEDED|REASON_FOR_REVOCATION_UID_RETIRED|REASON_FOR_REVOCATION_UNSPECIFIED|REVOCATION_STATUS_COULD_BE|REVOCATION_STATUS_FORCE_WIDTH|REVOCATION_STATUS_NOT_AS_FAR_AS_WE_KNOW|REVOCATION_STATUS_REVOKED|STATUS_BAD_SIGNATURE|STATUS_FORCE_WIDTH|STATUS_INDEX_OUT_OF_RANGE|STATUS_INVALID_ARGUMENT|STATUS_INVALID_OPERATION|STATUS_INVALID_PASSWORD|STATUS_INVALID_SESSION_KEY|STATUS_IO_ERROR|STATUS_MALFORMED_MESSAGE|STATUS_MALFORMED_PACKET|STATUS_MALFORMED_TPK|STATUS_MANIPULATED_MESSAGE|STATUS_MISSING_SESSION_KEY|STATUS_NETWORK_POLICY_VIOLATION|STATUS_SUCCESS|STATUS_UNKNOWN_ERROR|STATUS_UNSUPPORTED_AEAD_ALGORITHM|STATUS_UNSUPPORTED_ELLIPTIC_CURVE|STATUS_UNSUPPORTED_HASH_ALGORITHM|STATUS_UNSUPPORTED_PUBLICKEY_ALGORITHM|STATUS_UNSUPPORTED_SIGNATURE_TYPE|STATUS_UNSUPPORTED_SYMMETRIC_ALGORITHM|STATUS_UNSUPPORTED_TPK|TAG_COMPRESSED_DATA|TAG_LITERAL|TAG_MARKER|TAG_MDC|TAG_ONE_PASS_SIG|TAG_PKESK|TAG_PRIVATE|TAG_PUBLIC_KEY|TAG_PUBLIC_SUBKEY|TAG_RESERVED|TAG_SECRET_KEY|TAG_SECRET_SUBKEY|TAG_SED|TAG_SEIP|TAG_SIGNATURE|TAG_SKESK|TAG_TRUST|TAG_UNASSIGNED|TAG_USER_ATTRIBUTE|TAG_USER_ID|TPK_CIPHER_SUITE_CV|TPK_CIPHER_SUITE_FORCE_WIDTH|TPK_CIPHER_SUITE_RSA|VERIFICATION_RESULT_CODE_BAD_CHECKSUM|VERIFICATION_RESULT_CODE_FORCE_WIDTH|VERIFICATION_RESULT_CODE_GOOD_CHECKSUM|VERIFICATION_RESULT_CODE_MISSING_KEY)/PGP_\1/g' $F ; done

5 files changed, 63 insertions, 63 deletions

diff --git a/openpgp-ffi/examples/armor.c b/openpgp-ffi/examples/armor.c
index 9b965c5b..4c47be6c 100644
--- a/openpgp-ffi/examples/armor.c
+++ b/openpgp-ffi/examples/armor.c
@@ -19,20 +19,20 @@ const char *armored =
 int
 main (int argc, char **argv)
 {
-  sq_error_t err;
-  sq_reader_t bytes;
-  sq_reader_t armor;
-  sq_armor_kind_t kind;
+  pgp_error_t err;
+  pgp_reader_t bytes;
+  pgp_reader_t armor;
+  pgp_armor_kind_t kind;
   char message[12];
-  sq_armor_header_t *header;
+  pgp_armor_header_t *header;
   size_t header_len;
 
-  bytes = sq_reader_from_bytes ((uint8_t *) armored, strlen (armored));
-  armor = sq_armor_reader_new (bytes, SQ_ARMOR_KIND_ANY);
+  bytes = pgp_reader_from_bytes ((uint8_t *) armored, strlen (armored));
+  armor = pgp_armor_reader_new (bytes, PGP_ARMOR_KIND_ANY);
 
-  header = sq_armor_reader_headers (&err, armor, &header_len);
+  header = pgp_armor_reader_headers (&err, armor, &header_len);
   if (header == NULL)
-    error (1, 0, "Getting headers failed: %s", sq_error_string (err));
+    error (1, 0, "Getting headers failed: %s", pgp_error_string (err));
 
   assert (header_len == 2);
   assert (strcmp (header[0].key, "Key0") == 0
@@ -46,15 +46,15 @@ main (int argc, char **argv)
     }
   free (header);
 
-  kind = sq_armor_reader_kind (armor);
-  assert (kind == SQ_ARMOR_KIND_FILE);
+  kind = pgp_armor_reader_kind (armor);
+  assert (kind == PGP_ARMOR_KIND_FILE);
 
-  if (sq_reader_read (&err, armor, (uint8_t *) message, 12) < 0)
-      error (1, 0, "Reading failed: %s", sq_error_string (err));
+  if (pgp_reader_read (&err, armor, (uint8_t *) message, 12) < 0)
+      error (1, 0, "Reading failed: %s", pgp_error_string (err));
 
   assert (memcmp (message, "Hello world!", 12) == 0);
 
-  sq_reader_free (armor);
-  sq_reader_free (bytes);
+  pgp_reader_free (armor);
+  pgp_reader_free (bytes);
   return 0;
 }
diff --git a/openpgp-ffi/examples/encrypt-for.c b/openpgp-ffi/examples/encrypt-for.c
index ab0943ba..b34d3a9f 100644
--- a/openpgp-ffi/examples/encrypt-for.c
+++ b/openpgp-ffi/examples/encrypt-for.c
@@ -20,12 +20,12 @@ main (int argc, char **argv)
   struct stat st;
   int fd;
   uint8_t *b;
-  sq_status_t rc;
-  sq_error_t err;
+  pgp_status_t rc;
+  pgp_error_t err;
   int use_armor = 1;
-  sq_tpk_t tpk;
-  sq_writer_t sink;
-  sq_writer_stack_t writer = NULL;
+  pgp_tpk_t tpk;
+  pgp_writer_t sink;
+  pgp_writer_stack_t writer = NULL;
   void *cipher = NULL;
   size_t cipher_bytes = 0;
 
@@ -44,28 +44,28 @@ main (int argc, char **argv)
   if (b == MAP_FAILED)
     error (1, errno, "mmap");
 
-  tpk = sq_tpk_from_bytes (&err, b, st.st_size);
+  tpk = pgp_tpk_from_bytes (&err, b, st.st_size);
   if (tpk == NULL)
-    error (1, 0, "sq_packet_parser_from_bytes: %s", sq_error_string (err));
+    error (1, 0, "pgp_packet_parser_from_bytes: %s", pgp_error_string (err));
 
-  sink = sq_writer_alloc (&cipher, &cipher_bytes);
+  sink = pgp_writer_alloc (&cipher, &cipher_bytes);
 
   if (use_armor)
-    sink = sq_armor_writer_new (&err, sink, SQ_ARMOR_KIND_MESSAGE,
+    sink = pgp_armor_writer_new (&err, sink, PGP_ARMOR_KIND_MESSAGE,
                                 NULL, 0);
 
-  writer = sq_writer_stack_message (sink);
-  writer = sq_encryptor_new (&err,
+  writer = pgp_writer_stack_message (sink);
+  writer = pgp_encryptor_new (&err,
 			     writer,
 			     NULL, 0, /* no passwords */
 			     &tpk, 1,
-			     SQ_ENCRYPTION_MODE_FOR_TRANSPORT);
+			     PGP_ENCRYPTION_MODE_FOR_TRANSPORT);
   if (writer == NULL)
-    error (1, 0, "sq_encryptor_new: %s", sq_error_string (err));
+    error (1, 0, "pgp_encryptor_new: %s", pgp_error_string (err));
 
-  writer = sq_literal_writer_new (&err, writer);
+  writer = pgp_literal_writer_new (&err, writer);
   if (writer == NULL)
-    error (1, 0, "sq_literal_writer_new: %s", sq_error_string (err));
+    error (1, 0, "pgp_literal_writer_new: %s", pgp_error_string (err));
 
   size_t nread;
   uint8_t buf[4096];
@@ -75,19 +75,19 @@ main (int argc, char **argv)
       while (nread)
 	{
 	  ssize_t written;
-	  written = sq_writer_stack_write (&err, writer, b, nread);
+	  written = pgp_writer_stack_write (&err, writer, b, nread);
 	  if (written < 0)
-            error (1, 0, "sq_writer_stack_write: %s", sq_error_string (err));
+            error (1, 0, "pgp_writer_stack_write: %s", pgp_error_string (err));
 
 	  b += written;
 	  nread -= written;
 	}
     }
 
-  rc = sq_writer_stack_finalize (&err, writer);
+  rc = pgp_writer_stack_finalize (&err, writer);
   writer = NULL;
   if (rc)
-    error (1, 0, "sq_writer_stack_write: %s", sq_error_string (err));
+    error (1, 0, "pgp_writer_stack_write: %s", pgp_error_string (err));
 
   fwrite (cipher, 1, cipher_bytes, stdout);
 
diff --git a/openpgp-ffi/examples/example.c b/openpgp-ffi/examples/example.c
index ac23ff57..4d00876d 100644
--- a/openpgp-ffi/examples/example.c
+++ b/openpgp-ffi/examples/example.c
@@ -16,8 +16,8 @@ main (int argc, char **argv)
   struct stat st;
   int fd;
   uint8_t *b;
-  sq_error_t err;
-  sq_tpk_t tpk;
+  pgp_error_t err;
+  pgp_tpk_t tpk;
 
   if (argc != 2)
     error (1, 0, "Usage: %s <file>", argv[0]);
@@ -33,12 +33,12 @@ main (int argc, char **argv)
   if (b == MAP_FAILED)
     error (1, errno, "mmap");
 
-  tpk = sq_tpk_from_bytes (&err, b, st.st_size);
+  tpk = pgp_tpk_from_bytes (&err, b, st.st_size);
   if (tpk == NULL)
-    error (1, 0, "sq_tpk_from_bytes: %s", sq_error_string (err));
+    error (1, 0, "pgp_tpk_from_bytes: %s", pgp_error_string (err));
 
-  sq_tpk_dump (tpk);
-  sq_tpk_free (tpk);
+  pgp_tpk_dump (tpk);
+  pgp_tpk_free (tpk);
   munmap (b, st.st_size);
   close (fd);
   return 0;
diff --git a/openpgp-ffi/examples/parser.c b/openpgp-ffi/examples/parser.c
index 81b097af..3f9d90ab 100644
--- a/openpgp-ffi/examples/parser.c
+++ b/openpgp-ffi/examples/parser.c
@@ -20,10 +20,10 @@ main (int argc, char **argv)
   struct stat st;
   int fd;
   uint8_t *b;
-  sq_status_t rc;
-  sq_error_t err;
-  sq_packet_parser_result_t ppr;
-  sq_packet_parser_t pp;
+  pgp_status_t rc;
+  pgp_error_t err;
+  pgp_packet_parser_result_t ppr;
+  pgp_packet_parser_t pp;
 
   if (argc != 2)
     error (1, 0, "Usage: %s <file>", argv[0]);
@@ -45,23 +45,23 @@ main (int argc, char **argv)
   time_t elapsed;
   size_t tens_of_s = 0;
 
-  ppr = sq_packet_parser_from_bytes (&err, b, st.st_size);
-  while (ppr && (pp = sq_packet_parser_result_packet_parser (ppr)))
+  ppr = pgp_packet_parser_from_bytes (&err, b, st.st_size);
+  while (ppr && (pp = pgp_packet_parser_result_packet_parser (ppr)))
     {
       // Get a reference to the packet that is currently being parsed.
-      sq_packet_t p = sq_packet_parser_packet (pp);
+      pgp_packet_t p = pgp_packet_parser_packet (pp);
 
-      if (sq_packet_tag(p) == SQ_TAG_LITERAL)
+      if (pgp_packet_tag(p) == PGP_TAG_LITERAL)
         {
           // Stream the packet here.
         }
 
       // Finish parsing the current packet (returned in p), and read
       // the header of the next packet (returned in ppr).
-      rc = sq_packet_parser_next (&err, pp, &p, &ppr);
+      rc = pgp_packet_parser_next (&err, pp, &p, &ppr);
       if (rc)
-        error (1, 0, "sq_packet_parser_from_bytes: %s",
-               sq_error_string (err));
+        error (1, 0, "pgp_packet_parser_from_bytes: %s",
+               pgp_error_string (err));
 
       // We now own p.  If we want, we can save it in some structure.
       // This would be useful when collecting PKESK packets.  Either
@@ -69,7 +69,7 @@ main (int argc, char **argv)
 
       n += 1;
 
-      sq_packet_free (p);
+      pgp_packet_free (p);
 
       elapsed = time (NULL) - start;
       if (elapsed % 10 == 0 && tens_of_s != elapsed / 10)
@@ -82,12 +82,12 @@ main (int argc, char **argv)
         }
     }
   if (ppr == NULL)
-    error (1, 0, "sq_packet_parser_from_bytes: %s", sq_error_string (err));
+    error (1, 0, "pgp_packet_parser_from_bytes: %s", pgp_error_string (err));
 
   fprintf (stderr, "Parsed %ld packets in %ld seconds, %.2f packets/s.\n",
            n, elapsed, (double) n / (double) elapsed);
 
-  sq_packet_parser_result_free (ppr);
+  pgp_packet_parser_result_free (ppr);
   munmap (b, st.st_size);
   return 0;
 }
diff --git a/openpgp-ffi/examples/reader.c b/openpgp-ffi/examples/reader.c
index 019d87d9..f8a69adf 100644
--- a/openpgp-ffi/examples/reader.c
+++ b/openpgp-ffi/examples/reader.c
@@ -16,9 +16,9 @@ main (int argc, char **argv)
   struct stat st;
   int fd;
   uint8_t *b;
-  sq_error_t err;
-  sq_reader_t reader;
-  sq_tpk_t tpk;
+  pgp_error_t err;
+  pgp_reader_t reader;
+  pgp_tpk_t tpk;
 
   if (argc != 2)
     error (1, 0, "Usage: %s <file>", argv[0]);
@@ -34,14 +34,14 @@ main (int argc, char **argv)
   if (b == MAP_FAILED)
     error (1, errno, "mmap");
 
-  reader = sq_reader_from_bytes (b, st.st_size);
-  tpk = sq_tpk_from_reader (&err, reader);
+  reader = pgp_reader_from_bytes (b, st.st_size);
+  tpk = pgp_tpk_from_reader (&err, reader);
   if (tpk == NULL)
-    error (1, 0, "sq_tpk_from_reader: %s", sq_error_string (err));
+    error (1, 0, "pgp_tpk_from_reader: %s", pgp_error_string (err));
 
-  sq_tpk_dump (tpk);
-  sq_tpk_free (tpk);
-  sq_reader_free (reader);
+  pgp_tpk_dump (tpk);
+  pgp_tpk_free (tpk);
+  pgp_reader_free (reader);
   munmap (b, st.st_size);
   close (fd);
   return 0;