summaryrefslogtreecommitdiffstats
path: root/src/libserver
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2017-01-28 13:36:32 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2017-01-28 13:36:32 +0000
commit02b3c524724a65ae8b8291ee28c0eb4d4cf72516 (patch)
treeff45aeb42a48eb615fc8517d6d7ed62e891613c4 /src/libserver
parent605a33e6216729383d6c0adbba1215ac805dc134 (diff)
downloadrspamd-02b3c524724a65ae8b8291ee28c0eb4d4cf72516.tar.gz
rspamd-02b3c524724a65ae8b8291ee28c0eb4d4cf72516.zip
[Feature] Allow to pass sign key directly from Lua
Diffstat (limited to 'src/libserver')
-rw-r--r--src/libserver/dkim.c53
-rw-r--r--src/libserver/dkim.h9
2 files changed, 62 insertions, 0 deletions
diff --git a/src/libserver/dkim.c b/src/libserver/dkim.c
index 7e2dbec89..4ef2ad122 100644
--- a/src/libserver/dkim.c
+++ b/src/libserver/dkim.c
@@ -2025,6 +2025,59 @@ rspamd_dkim_sign_key_load (const gchar *path, GError **err)
return nkey;
}
+rspamd_dkim_sign_key_t*
+rspamd_dkim_sign_key_from_memory (const guchar *data,
+ gsize len, GError **err)
+{
+ rspamd_dkim_sign_key_t *nkey;
+ gpointer map;
+
+ map = mmap (NULL, len, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANON, -1, 0);
+
+ if (map == MAP_FAILED) {
+ g_set_error (err, dkim_error_quark (), DKIM_SIGERROR_KEYFAIL,
+ "cannot map in-memory private key %s",
+ strerror (errno));
+
+ return NULL;
+ }
+
+ /* Initialize memory and set the appropriate access mode */
+ memcpy (map, data, len);
+ (void)mprotect (map, len, PROT_READ);
+ (void)mlock (map, len);
+
+ nkey = g_slice_alloc0 (sizeof (*nkey));
+ nkey->keydata = map;
+ nkey->keylen = len;
+ nkey->key_bio = BIO_new_mem_buf (map, len);
+
+ if (!PEM_read_bio_PrivateKey (nkey->key_bio, &nkey->key_evp, NULL, NULL)) {
+ g_set_error (err, dkim_error_quark (), DKIM_SIGERROR_KEYFAIL,
+ "cannot read private key from memory: %s",
+ ERR_error_string (ERR_get_error (), NULL));
+ rspamd_dkim_sign_key_free (nkey);
+
+ return NULL;
+ }
+
+ nkey->key_rsa = EVP_PKEY_get1_RSA (nkey->key_evp);
+ if (nkey->key_rsa == NULL) {
+ g_set_error (err,
+ DKIM_ERROR,
+ DKIM_SIGERROR_KEYFAIL,
+ "cannot extract rsa key from evp key");
+ rspamd_dkim_sign_key_free (nkey);
+
+ return NULL;
+ }
+
+ REF_INIT_RETAIN (nkey, rspamd_dkim_sign_key_free);
+
+ return nkey;
+}
+
rspamd_dkim_sign_context_t *
rspamd_create_dkim_sign_context (struct rspamd_task *task,
rspamd_dkim_sign_key_t *priv_key,
diff --git a/src/libserver/dkim.h b/src/libserver/dkim.h
index b2ff151ad..ac3f04233 100644
--- a/src/libserver/dkim.h
+++ b/src/libserver/dkim.h
@@ -142,6 +142,15 @@ rspamd_dkim_sign_context_t * rspamd_create_dkim_sign_context (struct rspamd_task
rspamd_dkim_sign_key_t* rspamd_dkim_sign_key_load (const gchar *path, GError **err);
/**
+ * Load dkim key from memory chunk
+ * @param path
+ * @param err
+ * @return
+ */
+rspamd_dkim_sign_key_t* rspamd_dkim_sign_key_from_memory (const guchar *data,
+ gsize len, GError **err);
+
+/**
* Make DNS request for specified context and obtain and parse key
* @param ctx dkim context from signature
* @param resolver dns resolver object