*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
*/
#include <config.h>
}
static int
-hash_and_copy_data (int fd, gcry_md_hd_t md, KsbaWriter writer)
+hash_and_copy_data (int fd, gcry_md_hd_t md, ksba_writer_t writer)
{
- KsbaError err;
+ gpg_error_t err;
FILE *fp;
char buffer[4096];
int nread;
err = ksba_writer_write_octet_string (writer, buffer, nread, 0);
if (err)
{
- log_error ("write failed: %s\n", ksba_strerror (err));
- rc = map_ksba_err (err);
+ log_error ("write failed: %s\n", gpg_strerror (err));
+ rc = err;
}
}
}
err = ksba_writer_write_octet_string (writer, NULL, 0, 1);
if (err)
{
- log_error ("write failed: %s\n", ksba_strerror (err));
- rc = map_ksba_err (err);
+ log_error ("write failed: %s\n", gpg_strerror (err));
+ rc = err;
}
}
}
-/* Get the default certificate which is defined as the first one our
- keyDB retruns and has a secret key available */
+/* Get the default certificate which is defined as the first cabable
+ of signing our keyDB returns and has a secret key available. */
int
-gpgsm_get_default_cert (KsbaCert *r_cert)
+gpgsm_get_default_cert (ctrl_t ctrl, ksba_cert_t *r_cert)
{
KEYDB_HANDLE hd;
- KsbaCert cert = NULL;
+ ksba_cert_t cert = NULL;
int rc;
char *p;
keydb_release (hd);
return rc;
}
-
- p = gpgsm_get_keygrip_hexstring (cert);
- if (p)
+
+ if (!gpgsm_cert_use_sign_p (cert))
{
- if (!gpgsm_agent_havekey (p))
+ p = gpgsm_get_keygrip_hexstring (cert);
+ if (p)
{
+ if (!gpgsm_agent_havekey (ctrl, p))
+ {
+ xfree (p);
+ keydb_release (hd);
+ *r_cert = cert;
+ return 0; /* got it */
+ }
xfree (p);
- keydb_release (hd);
- *r_cert = cert;
- return 0; /* got it */
}
- xfree (p);
}
-
+
ksba_cert_release (cert);
cert = NULL;
}
}
-static KsbaCert
-get_default_signer (void)
+static ksba_cert_t
+get_default_signer (ctrl_t ctrl)
{
KEYDB_SEARCH_DESC desc;
- KsbaCert cert = NULL;
+ ksba_cert_t cert = NULL;
KEYDB_HANDLE kh = NULL;
int rc;
if (!opt.local_user)
{
- rc = gpgsm_get_default_cert (&cert);
+ rc = gpgsm_get_default_cert (ctrl, &cert);
if (rc)
{
if (rc != -1)
other certificate up in the chain to the Root-CA to the CMS
object. */
static int
-add_certificate_list (CTRL ctrl, KsbaCMS cms, KsbaCert cert)
+add_certificate_list (ctrl_t ctrl, ksba_cms_t cms, ksba_cert_t cert)
{
- KsbaError err;
+ gpg_error_t err;
int rc = 0;
- KsbaCert next = NULL;
+ ksba_cert_t next = NULL;
int n;
int not_root = 0;
ksba_cert_ref (cert);
n = ctrl->include_certs;
+ log_debug ("adding certificates at level %d\n", n);
if (n == -2)
{
not_root = 1;
if (n < 0 || n > 50)
n = 50; /* We better apply an upper bound */
+ /* First add my own certificate unless we don't want any certificate
+ included at all. */
if (n)
{
if (not_root && gpgsm_is_root_cert (cert))
err = ksba_cms_add_cert (cms, cert);
if (err)
goto ksba_failure;
+ if (n>0)
+ n--;
}
+ /* Walk the chain to include all other certificates. Note that a -1
+ used for N makes sure that there is no limit and all certs get
+ included. */
while ( n-- && !(rc = gpgsm_walk_cert_chain (cert, &next)) )
{
if (not_root && gpgsm_is_root_cert (next))
ksba_failure:
ksba_cert_release (cert);
- log_error ("ksba_cms_add_cert failed: %s\n", ksba_strerror (err));
- return map_ksba_err (err);
+ log_error ("ksba_cms_add_cert failed: %s\n", gpg_strerror (err));
+ return err;
}
keys used to sign are taken from SIGNERLIST or the default one will
be used if the value of this argument is NULL. */
int
-gpgsm_sign (CTRL ctrl, CERTLIST signerlist,
+gpgsm_sign (ctrl_t ctrl, certlist_t signerlist,
int data_fd, int detached, FILE *out_fp)
{
int i, rc;
- KsbaError err;
+ gpg_error_t err;
Base64Context b64writer = NULL;
- KsbaWriter writer;
- KsbaCMS cms = NULL;
- KsbaStopReason stopreason;
+ ksba_writer_t writer;
+ ksba_cms_t cms = NULL;
+ ksba_stop_reason_t stopreason;
KEYDB_HANDLE kh = NULL;
gcry_md_hd_t data_md = NULL;
int signer;
const char *algoid;
int algo;
ksba_isotime_t signed_at;
- CERTLIST cl;
+ certlist_t cl;
int release_signerlist = 0;
kh = keydb_new (0);
}
ctrl->pem_name = "SIGNED MESSAGE";
- rc = gpgsm_create_writer (&b64writer, ctrl, out_fp, &writer);
+ rc = gpgsm_create_writer (&b64writer, ctrl, out_fp, NULL, &writer);
if (rc)
{
log_error ("can't create writer: %s\n", gpg_strerror (rc));
goto leave;
}
- cms = ksba_cms_new ();
- if (!cms)
+ err = ksba_cms_new (&cms);
+ if (err)
{
- rc = gpg_error (GPG_ERR_ENOMEM);
+ rc = err;
goto leave;
}
if (err)
{
log_debug ("ksba_cms_set_reader_writer failed: %s\n",
- ksba_strerror (err));
- rc = map_ksba_err (err);
+ gpg_strerror (err));
+ rc = err;
goto leave;
}
if (err)
{
log_debug ("ksba_cms_set_content_type failed: %s\n",
- ksba_strerror (err));
- rc = map_ksba_err (err);
+ gpg_strerror (err));
+ rc = err;
goto leave;
}
/* If no list of signers is given, use a default one. */
if (!signerlist)
{
- KsbaCert cert = get_default_signer ();
+ ksba_cert_t cert = get_default_signer (ctrl);
if (!cert)
{
log_error ("no default signer found\n");
rc = gpg_error (GPG_ERR_GENERAL);
goto leave;
}
+
+ /* Although we don't check for ambigious specification we will
+ check that the signer's certificate is is usable and
+ valid. */
+ rc = gpgsm_cert_use_sign_p (cert);
+ if (!rc)
+ rc = gpgsm_validate_chain (ctrl, cert, NULL, 0, NULL, 0);
+ if (rc)
+ goto leave;
+
+ /* That one is fine - create signerlist. */
signerlist = xtrycalloc (1, sizeof *signerlist);
if (!signerlist)
{
- rc = OUT_OF_CORE (errno);
+ rc = out_of_core ();
ksba_cert_release (cert);
goto leave;
}
err = ksba_cms_add_signer (cms, cl->cert);
if (err)
{
- log_error ("ksba_cms_add_signer failed: %s\n", ksba_strerror (err));
- rc = map_ksba_err (err);
+ log_error ("ksba_cms_add_signer failed: %s\n", gpg_strerror (err));
+ rc = err;
goto leave;
}
rc = add_certificate_list (ctrl, cms, cl->cert);
if (err)
{
log_debug ("ksba_cms_add_digest_algo failed: %s\n",
- ksba_strerror (err));
- rc = map_ksba_err (err);
+ gpg_strerror (err));
+ rc = err;
+ goto leave;
+ }
+ }
+
+
+ /* Check whether one of the certificates is qualified. Note that we
+ already validated the certificate and thus the user data stored
+ flag must be available. */
+ for (cl=signerlist; cl; cl = cl->next)
+ {
+ size_t buflen;
+ char buffer[1];
+
+ err = ksba_cert_get_user_data (cl->cert, "is_qualified",
+ &buffer, sizeof (buffer), &buflen);
+ if (err || !buflen)
+ {
+ log_error (_("checking for qualified certificate failed: %s\n"),
+ gpg_strerror (err));
+ rc = err;
+ goto leave;
+ }
+ if (*buffer)
+ err = gpgsm_qualified_consent (ctrl, cl->cert);
+ else
+ err = gpgsm_not_qualified_warning (ctrl, cl->cert);
+ if (err)
+ {
+ rc = err;
goto leave;
}
}
if (!algo)
{
log_error ("unknown hash algorithm `%s'\n", algoid? algoid:"?");
+ if (algoid
+ && ( !strcmp (algoid, "1.2.840.113549.1.1.2")
+ ||!strcmp (algoid, "1.2.840.113549.2.2")))
+ log_info (_("(this is the MD2 algorithm)\n"));
rc = gpg_error (GPG_ERR_BUG);
goto leave;
}
unsigned char *digest;
size_t digest_len;
/* Fixme do this for all signers and get the algo to use from
- the signer's certificate - does not make mich sense, bu we
- should do this consistent as we have already done it above */
+ the signer's certificate - does not make mich sense, but we
+ should do this consistent as we have already done it above. */
algo = GCRY_MD_SHA1;
hash_data (data_fd, data_md);
digest = gcry_md_read (data_md, algo);
if (err)
{
log_error ("ksba_cms_set_message_digest failed: %s\n",
- ksba_strerror (err));
- rc = map_ksba_err (err);
+ gpg_strerror (err));
+ rc = err;
goto leave;
}
}
if (err)
{
log_error ("ksba_cms_set_signing_time failed: %s\n",
- ksba_strerror (err));
- rc = map_ksba_err (err);
+ gpg_strerror (err));
+ rc = err;
goto leave;
}
}
+ /* We need to write at least a minimal list of our capabilities to
+ try to convince some MUAs to use 3DEs and not the crippled
+ RC2. Our list is:
+
+ aes128-CBC
+ des-EDE3-CBC
+ */
+ err = ksba_cms_add_smime_capability (cms, "2.16.840.1.101.3.4.1.2", NULL, 0);
+ if (!err)
+ err = ksba_cms_add_smime_capability (cms, "1.2.840.113549.3.7", NULL, 0);
+ if (err)
+ {
+ log_error ("ksba_cms_add_smime_capability failed: %s\n",
+ gpg_strerror (err));
+ goto leave;
+ }
+
+
+ /* Main building loop. */
do
{
err = ksba_cms_build (cms, &stopreason);
if (err)
{
- log_debug ("ksba_cms_build failed: %s\n", ksba_strerror (err));
- rc = map_ksba_err (err);
+ log_debug ("ksba_cms_build failed: %s\n", gpg_strerror (err));
+ rc = err;
goto leave;
}
if (err)
{
log_error ("ksba_cms_set_message_digest failed: %s\n",
- ksba_strerror (err));
- rc = map_ksba_err (err);
+ gpg_strerror (err));
+ rc = err;
goto leave;
}
}
ksba_cms_set_hash_function (cms, HASH_FNC, md);
for (cl=signerlist,signer=0; cl; cl = cl->next, signer++)
{
- char *sigval = NULL;
+ unsigned char *sigval = NULL;
char *buf, *fpr;
if (signer)
if (rc)
{
log_debug ("hashing signed attrs failed: %s\n",
- ksba_strerror (rc));
+ gpg_strerror (rc));
gcry_md_close (md);
goto leave;
}
- rc = gpgsm_create_cms_signature (cl->cert, md, algo, &sigval);
+ rc = gpgsm_create_cms_signature (ctrl, cl->cert,
+ md, algo, &sigval);
if (rc)
{
gcry_md_close (md);
if (err)
{
log_error ("failed to store the signature: %s\n",
- ksba_strerror (err));
- rc = map_ksba_err (err);
+ gpg_strerror (err));
+ rc = err;
gcry_md_close (md);
goto leave;
}
gcry_md_close (md);
goto leave;
}
- rc = asprintf (&buf, "%c %d %d 00 %s %s",
- detached? 'D':'S',
- GCRY_PK_RSA, /* FIXME: get pk algo from cert */
- algo,
- signed_at,
- fpr);
+ {
+ int pkalgo = gpgsm_get_key_algo_info (cl->cert, NULL);
+ rc = asprintf (&buf, "%c %d %d 00 %s %s",
+ detached? 'D':'S',
+ pkalgo,
+ algo,
+ signed_at,
+ fpr);
+ }
xfree (fpr);
if (rc < 0)
{
leave:
+ if (rc)
+ log_error ("error creating signature: %s <%s>\n",
+ gpg_strerror (rc), gpg_strsource (rc) );
if (release_signerlist)
gpgsm_release_certlist (signerlist);
ksba_cms_release (cms);
projects / gnupg.git / blobdiff