Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow multiple certificate formats for S/MIME (10.0) #231

Merged
merged 2 commits into from
May 29, 2019
Merged

Allow multiple certificate formats for S/MIME (10.0) #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b7767f
Allow multiple certificate formats for S/MIME
timopollmeier May 17, 2019
2479475
Add missing spaces in macro/function calls
timopollmeier May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 89 additions & 18 deletions util/gpgmeutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,40 +171,67 @@ gvm_init_gpgme_ctx_from_dir (const gchar *dir)
* @param[in] ctx The GPGME context to import the key / certificate into.
* @param[in] key_str Key or certificate string.
* @param[in] key_len Length of key/certificate string or -1 to use strlen.
* @param[in] key_type The expected key type.
* @param[in] key_types GArray of expected key types.
*
* @return 0 success, 1 invalid key data, 2 unexpected key data,
* 3 error importing key/certificate, -1 error.
*/
int
gvm_gpg_import_from_string (gpgme_ctx_t ctx, const char *key_str,
ssize_t key_len, gpgme_data_type_t key_type)
gvm_gpg_import_many_types_from_string (gpgme_ctx_t ctx,
const char *key_str,
ssize_t key_len,
GArray* key_types)
{
gpgme_data_t key_data;
gpgme_error_t err;
gpgme_data_type_t given_key_type;
gpgme_import_result_t import_result;
int ret;

gpgme_data_new_from_mem (
&key_data, key_str, (key_len >= 0 ? key_len : (ssize_t) strlen (key_str)),
0);

given_key_type = gpgme_data_identify (key_data, 0);
if (given_key_type != key_type)
ret = 0;
if (given_key_type == GPGME_DATA_TYPE_INVALID)
{
int ret;
if (given_key_type == GPGME_DATA_TYPE_INVALID)
ret = 1;
g_warning ("%s: key_str is invalid", __FUNCTION__);
}
else
{
unsigned int index;
for (index = 0; index < key_types->len; index++)
{
ret = 1;
g_warning ("%s: key_str is invalid", __FUNCTION__);
if (g_array_index (key_types, gpgme_data_type_t, index)
== given_key_type)
break;
}
else

if (index >= key_types->len)
{
ret = 2;
GString *expected_buffer = g_string_new ("");
for (index = 0; index < key_types->len; index++)
{
if (index)
g_string_append (expected_buffer, " or ");
g_string_append_printf (expected_buffer,
"%d",
g_array_index (key_types,
gpgme_data_type_t,
index));
}
g_warning ("%s: key_str is not the expected type: "
" expected: %d, got %d",
__FUNCTION__, key_type, given_key_type);
" expected: %s, got %d",
__FUNCTION__, expected_buffer->str, given_key_type);
g_string_free (expected_buffer, TRUE);
}
}

if (ret)
{
gpgme_data_release (key_data);
return ret;
}
Expand Down Expand Up @@ -240,6 +267,33 @@ gvm_gpg_import_from_string (gpgme_ctx_t ctx, const char *key_str,
return 0;
}

/**
* @brief Import a key or certificate given by a string.
*
* @param[in] ctx The GPGME context to import the key / certificate into.
* @param[in] key_str Key or certificate string.
* @param[in] key_len Length of key/certificate string or -1 to use strlen.
* @param[in] key_type The expected key type.
*
* @return 0 success, 1 invalid key data, 2 unexpected key data,
* 3 error importing key/certificate, -1 error.
*/
int
gvm_gpg_import_from_string (gpgme_ctx_t ctx, const char *key_str,
ssize_t key_len, gpgme_data_type_t key_type)
{
int ret;
GArray *key_types = g_array_sized_new (FALSE,
FALSE,
sizeof (gpgme_data_type_t),
1);
g_array_insert_val (key_types, 0, key_type);
ret = gvm_gpg_import_many_types_from_string (ctx, key_str, key_len,
key_types);
g_array_free (key_types, TRUE);
return ret;
}

/**
* @brief Find a key that can be used to encrypt for an email recipient.
*
Expand Down Expand Up @@ -315,15 +369,15 @@ find_email_encryption_key (gpgme_ctx_t ctx, const char *uid_email)
* @param[in] key_len Length of key / certificate, -1 to use strlen.
* @param[in] uid_email Email address of key / certificate to use.
* @param[in] protocol The protocol to use, e.g. OpenPGP or CMS.
* @param[in] data_type The expected GPGME buffered data type.
* @param[in] data_types The expected GPGME buffered data types.
*
* @return 0 success, -1 error.
*/
static int
encrypt_stream_internal (FILE *plain_file, FILE *encrypted_file,
const char *key_str, ssize_t key_len,
const char *uid_email, gpgme_protocol_t protocol,
gpgme_data_type_t data_type)
GArray* key_types)
{
char gpg_temp_dir[] = "/tmp/gvmd-gpg-XXXXXX";
gpgme_ctx_t ctx;
Expand Down Expand Up @@ -365,7 +419,7 @@ encrypt_stream_internal (FILE *plain_file, FILE *encrypted_file,
encrypt_flags = GPGME_ENCRYPT_ALWAYS_TRUST | GPGME_ENCRYPT_NO_COMPRESS;

// Import public key into context
if (gvm_gpg_import_from_string (ctx, key_str, key_len, data_type))
if (gvm_gpg_import_many_types_from_string (ctx, key_str, key_len, key_types))
{
g_warning ("%s: Import of %s failed", __FUNCTION__, key_type_str);
gpgme_release (ctx);
Expand Down Expand Up @@ -433,9 +487,17 @@ gvm_pgp_pubkey_encrypt_stream (FILE *plain_file, FILE *encrypted_file,
const char *public_key_str,
ssize_t public_key_len)
{
return encrypt_stream_internal (
int ret;
const gpgme_data_type_t types_ptr[1] = {GPGME_DATA_TYPE_PGP_KEY};
GArray *key_types = g_array_new (FALSE, FALSE, sizeof (gpgme_data_type_t));

g_array_append_vals (key_types, types_ptr, 1);
ret = encrypt_stream_internal (
plain_file, encrypted_file, public_key_str, public_key_len, uid_email,
GPGME_PROTOCOL_OpenPGP, GPGME_DATA_TYPE_PGP_KEY);
GPGME_PROTOCOL_OpenPGP, key_types);
g_array_free (key_types, TRUE);

return ret;
}

/**
Expand All @@ -456,7 +518,16 @@ gvm_smime_encrypt_stream (FILE *plain_file, FILE *encrypted_file,
const char *uid_email, const char *certificate_str,
ssize_t certificate_len)
{
return encrypt_stream_internal (
int ret;
const gpgme_data_type_t types_ptr[2] = {GPGME_DATA_TYPE_X509_CERT,
GPGME_DATA_TYPE_CMS_OTHER};
GArray *key_types = g_array_new (FALSE, FALSE, sizeof (gpgme_data_type_t));

g_array_append_vals (key_types, types_ptr, 2);
ret = encrypt_stream_internal (
plain_file, encrypted_file, certificate_str, certificate_len, uid_email,
GPGME_PROTOCOL_CMS, GPGME_DATA_TYPE_CMS_OTHER);
GPGME_PROTOCOL_CMS, key_types);
g_array_free (key_types, TRUE);

return ret;
}
6 changes: 6 additions & 0 deletions util/gpgmeutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ log_gpgme (GLogLevelFlags, gpg_error_t, const char *, ...);
gpgme_ctx_t
gvm_init_gpgme_ctx_from_dir (const gchar *);

int
gvm_gpg_import_many_types_from_string (gpgme_ctx_t,
const char *,
ssize_t,
GArray*);

int
gvm_gpg_import_from_string (gpgme_ctx_t, const char *, ssize_t,
gpgme_data_type_t);
Expand Down