Revision 216
| src/rfc2015.c (revision 216) | ||
|---|---|---|
| 659 | 659 |
err = gpgme_data_new (&cipher); |
| 660 | 660 |
if (!err) {
|
| 661 | 661 |
gpgme_set_armor (ctx, 1); |
| 662 |
err = (gpgme_data_seek(plain, 0, SEEK_SET) == -1) ? |
|
| 663 |
gpgme_error_from_errno(errno) : 0; |
|
| 662 |
err = (gpgme_data_seek(plain, 0, SEEK_SET) == -1) ?
|
|
| 663 |
gpgme_error_from_errno(errno) : 0;
|
|
| 664 | 664 |
if (!err) {
|
| 665 | 665 |
/* |
| 666 | 666 |
* Note -- it is currently the responsibility of select-keys.c:: |
| ... | ... | |
| 673 | 673 |
} |
| 674 | 674 |
|
| 675 | 675 |
if (err) {
|
| 676 |
debug_print ("encryption failed: %s\n", gpgme_strerror (err));
|
|
| 676 |
g_warning ("pgp_encrypt(): encryption failed: %s\n",
|
|
| 677 |
gpgme_strerror (err)); |
|
| 677 | 678 |
gpgme_data_release (cipher); |
| 678 | 679 |
cipher = NULL; |
| 679 | 680 |
} |
| ... | ... | |
| 997 | 998 |
gpgme_set_armor (ctx, 1); |
| 998 | 999 |
gpgme_signers_clear (ctx); |
| 999 | 1000 |
for (p = key_list; p != NULL; p = p->next) {
|
| 1000 |
err = gpgme_signers_add (ctx, (gpgme_key_t) p->data); |
|
| 1001 |
err = gpgme_signers_add (ctx, (gpgme_key_t) p->data);
|
|
| 1001 | 1002 |
if (err) |
| 1002 | 1003 |
goto leave; |
| 1003 | 1004 |
} |
| ... | ... | |
| 1011 | 1012 |
err = gpgme_op_sign (ctx, plain, sig, |
| 1012 | 1013 |
clearsign ? GPGME_SIG_MODE_CLEAR : GPGME_SIG_MODE_DETACH); |
| 1013 | 1014 |
} |
| 1014 |
if (!err) |
|
| 1015 |
if (!err) {
|
|
| 1015 | 1016 |
result = gpgme_op_sign_result(ctx); |
| 1016 |
if (result) {
|
|
| 1017 |
if (result && result->signatures) {
|
|
| 1017 | 1018 |
if (gpgme_get_protocol(ctx) == GPGME_PROTOCOL_OpenPGP) {
|
| 1018 | 1019 |
*micalg = g_strdup_printf("PGP-%s", gpgme_hash_algo_name(
|
| 1019 | 1020 |
result->signatures->hash_algo)); |
| ... | ... | |
| 1021 | 1022 |
*micalg = g_strdup(gpgme_hash_algo_name( |
| 1022 | 1023 |
result->signatures->hash_algo)); |
| 1023 | 1024 |
} |
| 1025 |
} else {
|
|
| 1026 |
/* can't get result (maybe no signing key?) */ |
|
| 1027 |
err = GPG_ERR_USER_1; |
|
| 1024 | 1028 |
} |
| 1029 |
} |
|
| 1025 | 1030 |
|
| 1026 | 1031 |
leave: |
| 1027 | 1032 |
if (err) {
|
| 1028 | 1033 |
gpgmegtk_free_passphrase(); |
| 1029 |
debug_print ("signing failed: %s\n", gpgme_strerror (err));
|
|
| 1034 |
g_warning ("pgp_sign(): signing failed: %s\n", gpgme_strerror (err));
|
|
| 1030 | 1035 |
gpgme_data_release (sig); |
| 1031 | 1036 |
sig = NULL; |
| 1032 |
} |
|
| 1033 |
else {
|
|
| 1037 |
} else {
|
|
| 1034 | 1038 |
debug_print ("signing succeeded\n");
|
| 1035 | 1039 |
} |
| 1036 | 1040 |
|
| ... | ... | |
| 1265 | 1269 |
gpgme_data_t text = NULL; |
| 1266 | 1270 |
gpgme_data_t sigdata = NULL; |
| 1267 | 1271 |
ssize_t bytesRW = 0; |
| 1268 |
gchar *micalg; |
|
| 1272 |
gchar *micalg = NULL;
|
|
| 1269 | 1273 |
|
| 1270 | 1274 |
if ((fp = fopen(file, "rb")) == NULL) {
|
| 1271 | 1275 |
FILE_OP_ERROR(file, "fopen"); |
| src/sigstatus.c (revision 216) | ||
|---|---|---|
| 222 | 222 |
{
|
| 223 | 223 |
const gchar *result = "?"; |
| 224 | 224 |
|
| 225 |
g_return_val_if_fail(signature != NULL, result); |
|
| 226 |
|
|
| 225 | 227 |
switch (gpg_err_code(signature->status)) {
|
| 226 | 228 |
case GPG_ERR_NO_DATA: |
| 227 | 229 |
result = _("No signature found");
|
| ChangeLog.ja (revision 216) | ||
|---|---|---|
| 1 |
2005-04-13 |
|
| 2 |
|
|
| 3 |
* src/rfc2015.c: pgp_sign(): ???̤?ȴ???Ƥ????Τ??????? |
|
| 4 |
result->signatures ?? NULL ?Ǥʤ????ɤ??????????å?(~/.gnupg ?? |
|
| 5 |
¸?ߤ??ʤ??????˥????å??夹???Τ?????)?? |
|
| 6 |
* src/sigstatus.c: gpgmegtk_sig_status_to_string(): signature ?? |
|
| 7 |
NULL ?Ǥʤ????ɤ??????????å??? |
|
| 8 |
|
|
| 1 | 9 |
2005-04-12 |
| 2 | 10 |
|
| 3 | 11 |
* version 1.9.8 |
| configure.in (revision 216) | ||
|---|---|---|
| 9 | 9 |
MICRO_VERSION=8 |
| 10 | 10 |
INTERFACE_AGE=0 |
| 11 | 11 |
BINARY_AGE=0 |
| 12 |
EXTRA_VERSION= |
|
| 12 |
EXTRA_VERSION=+svn
|
|
| 13 | 13 |
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION |
| 14 | 14 |
|
| 15 | 15 |
dnl set $target |
| ChangeLog (revision 216) | ||
|---|---|---|
| 1 |
2005-04-13 |
|
| 2 |
|
|
| 3 |
* src/rfc2015.c: pgp_sign(): fixed missing brackets. Check if |
|
| 4 |
result->signatures is not NULL (fix crashes when ~/.gnupg doesn't |
|
| 5 |
exist). |
|
| 6 |
* src/sigstatus.c: gpgmegtk_sig_status_to_string(): check if signature |
|
| 7 |
is not NULL. |
|
| 8 |
|
|
| 1 | 9 |
2005-04-12 |
| 2 | 10 |
|
| 3 | 11 |
* version 1.9.8 |
Also available in: Unified diff