diff options
| author | David Shaw <[email protected]> | 2005-10-11 22:13:49 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-10-11 22:13:49 +0000 |
| commit | 47433adaa56339dbc28c60b9f800fe1522312ad2 (patch) | |
| tree | f27b972c447a3284f9f23c5c920e0d8d2736ce11 /g10/getkey.c | |
| parent | Yet another fix for the gpg.c rename (diff) | |
| download | gnupg-47433adaa56339dbc28c60b9f800fe1522312ad2.tar.gz gnupg-47433adaa56339dbc28c60b9f800fe1522312ad2.zip | |
* getkey.c (merge_selfsigs_subkey), sig-check.c (signature_check2),
keygen.c (make_backsig): Did some backsig interop testing with the PGP
folks. All is well, so I'm turning generation of backsigs on for new
keys. Checking for backsigs on verification is still off.
Diffstat (limited to '')
| -rw-r--r-- | g10/getkey.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 07bdfcbd7..864c8bfb7 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -2043,10 +2043,6 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode ) subpk->is_valid = 1; -#ifndef DO_BACKSIGS - /* Pretend the backsig is present and accounted for. */ - subpk->backsig=2; -#else /* Find the first 0x19 embedded signature on our self-sig. */ if(subpk->backsig==0) { @@ -2086,6 +2082,12 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode ) free_seckey_enc(backsig); } } + +#ifdef FAKE_BACKSIGS + /* If there is no backsig, pretend there is a valid one. If there + is a backsig (or an invalid backsig), use it. */ + if(subpk->backsig==0) + subpk->backsig=2; #endif } |