Browse Source

merging in 4999

ENGINE-812
Volker Birk 2 years ago
parent
commit
b92bf2e934
5 changed files with 61 additions and 59 deletions
  1. +1
    -1
      src/message_api.c
  2. +1
    -1
      src/pEpEngine.h
  3. +3
    -3
      sync/sync.fsm
  4. +35
    -34
      test/test_keys/priv/pep-test-dave-0xBB5BCCF6_priv.asc
  5. +21
    -20
      test/test_keys/pub/pep-test-dave-0xBB5BCCF6_pub.asc

+ 1
- 1
src/message_api.c View File

@ -4294,7 +4294,7 @@ static PEP_STATUS _decrypt_message(
dedup_stringlist(_keylist->next);
/* add pEp-related status flags to header */
decorate_message(msg, *rating, _keylist, false, false);
decorate_message(msg, *rating, _keylist, false, true);
// Maybe unnecessary
// if (keys_were_imported)


+ 1
- 1
src/pEpEngine.h View File

@ -25,7 +25,7 @@ extern "C" {
#define PEP_ENGINE_VERSION_MAJOR 2
#define PEP_ENGINE_VERSION_MINOR 1
#define PEP_ENGINE_VERSION_PATCH 0
#define PEP_ENGINE_VERSION_RC 27
#define PEP_ENGINE_VERSION_RC 29
#define PEP_OWN_USERID "pEp_own_userId"


+ 3
- 3
sync/sync.fsm View File

@ -19,15 +19,15 @@ protocol Sync 1 {
send SynchronizeGroupKeys;
go Grouped;
}
do newChallengeAndNegotiationBase;
debug > initial Beacon
send Beacon;
go Sole;
}
}
state Sole timeout=off {
on Init {
do newChallengeAndNegotiationBase;
debug > initial Beacon
send Beacon;
do showBeingSole;
}


+ 35
- 34
test/test_keys/priv/pep-test-dave-0xBB5BCCF6_priv.asc View File

@ -20,38 +20,39 @@ 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
=DR2m
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
oxjLclwYcjrWkMcHKg7bmJh7Fg==
=Yst9
-----END PGP PRIVATE KEY BLOCK-----

+ 21
- 20
test/test_keys/pub/pep-test-dave-0xBB5BCCF6_pub.asc View File

@ -7,24 +7,25 @@ JxdtlWfbTOe+QImoYxUCrhomyOf5ramnOmWIIR7oAa8LxuWTC8nGaiSuvCSgPwo/
2dWyMyEGMkokfj3RhkLfGs3IKOXORQicKRYmsHO3p9YMduXRKDiRQ3H1FedIoaVn
xXYbQTtL897PjS6B+BSHquHzJZwrag/KE8+ZABEBAAG0P3BFcCBUZXN0IERhdmUg
KFRlc3QgRG8gTm90IFVzZSkgPHBlcC10ZXN0LWRhdmVAcGVwLXByb2plY3Qub3Jn
PokBPwQTAQgAKQUCWBxv8wIbAwUJBzW0AAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4B
AheAAAoJELBJ9Im7W8z29mUIAJQaPFLd3ydRIdBsgg6lP0ueXH383C4DNPM4cDMf
UNwyAqUjYzX09xVJHVMOPRcIfdrZLHZ5t2ro26wqWbHynEmIeBBTEf/wLMf4CFKV
fbm53zhbOzfFc5TB3hZVCU6pDowGh4POUapzYOkK17QNGfm/AjqEuntj0RNO4jIS
yihqSZH+QEYFv7ZTPZc9VbQ1YvTlXt6As0KW2c1uraObuDgmFJlUhED/l2yZfRqw
JVjvxXESjSHuLGSijDJlKZBcdsryy06KwzUNRUblbIR+xgNLnrsZWlb4EXQ9TBth
3mShJbIaCMxpOiuavFjtdYBEIxzEpb2QmB7Z9AVaXys9PC65AQ0EWBxv8wEIAMEW
cd7akENhm+qScRlyzJRamB7DJUK79ZtU0DoJuK9FFdjdFjTvIPkjtPREaaA0GwNj
SLkipff9yExk/QtjbQM0oaNBaDOqql9wT3MX9WLZxd1feeQ7UW2UZu9zqTuocDim
HsCTFDUCWkxrzR3COVN2F+8r3uMqbNrqayUeRpOvn+9Cs6nSGEG70GeaqZnYJyaO
bwKlWDW5acOnPDicCSKvpRHZY+SJF+n/KjKszmg/EMPk8j0sYXAZ7/mu8x3XuxfQ
tb8FeV874cavDGwEhyp9+QVJHNbl5Op7Q/69rSNnfpIq4B/vL/5yJ/TbVZ9kaeys
sKQMgA6nXuyP6pgEDW0AEQEAAYkBJQQYAQgADwUCWBxv8wIbDAUJBzW0AAAKCRCw
SfSJu1vM9ssECAChrPncgPlg7AIZk6TOev9UuqIubbZWn1GKM67RziylGfisGkE5
ZuONPXfbuHz/dS83UzIc7oHwmmPNKhiQFf0MMp3wxaO1V4w1sPPPkzNlLaorwzZw
wGvG5zvYx14o0cZtZVkwQxyJKNDvYLIS+ye7fCySmuY/Fa5juFmeotuOLt6Ch5QK
pMaAUOOSOAay82LP/Ne6nD7AQOIohG0HNvCl9Qfh+AAgezWUmTZ+5ZBKcQXukOQ+
MplFGRkPMX9bqTZw9Xpg+CccZNFsLfcTrCkuQrk6iyLuNMxox1FE/ceva2RcWEwM
9kdsFQwgtqRhZlmaRIiGydJ9ZPZ/BW+/sd1y
=3vo3
PokBUAQTAQgAOgIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAFiEE6KyXeaLR
OhXY1VyEsEn0ibtbzPYFAl9WW/UACgkQsEn0ibtbzPboEAgAqaiIO0RVcb+vsW42
v8HQffklt2jO0xGXdYOdSoRoaSZyvYq0/jFY+3BnO3awsW0rRaDJhgWDRCvwuOTl
3o4QhUeRmk48EBqNvDu9Ryz9GN3Yjpn5R4dSJLHC2bTthqvrmjMnicUuiAbysUOy
VlHZbl2V5N75FiD+w1EqFixisM/bnd13xHrvKDlA9mhtw8bPwoZKfKRIT+YRqVpM
7cIFceaVrxN8mfakJT8cqTzhFfHvqIal1A9ZOfDjQoB5OM1h3eLOUXv1sos/uNxl
Jn4P2s5X88OV1Ws7Q6E29DcIYYT/bOVV+RJcwnNd7y0x6URHXyxV9yI5Enn5ePhT
7Au6zrkBDQRYHG/zAQgAwRZx3tqQQ2Gb6pJxGXLMlFqYHsMlQrv1m1TQOgm4r0UV
2N0WNO8g+SO09ERpoDQbA2NIuSKl9/3ITGT9C2NtAzSho0FoM6qqX3BPcxf1YtnF
3V955DtRbZRm73OpO6hwOKYewJMUNQJaTGvNHcI5U3YX7yve4yps2uprJR5Gk6+f
70KzqdIYQbvQZ5qpmdgnJo5vAqVYNblpw6c8OJwJIq+lEdlj5IkX6f8qMqzOaD8Q
w+TyPSxhcBnv+a7zHde7F9C1vwV5Xzvhxq8MbASHKn35BUkc1uXk6ntD/r2tI2d+
kirgH+8v/nIn9NtVn2Rp7KywpAyADqde7I/qmAQNbQARAQABiQE2BBgBCAAgAhsM
FiEE6KyXeaLROhXY1VyEsEn0ibtbzPYFAl9WXAUACgkQsEn0ibtbzPabXAgAlJLX
w0Z1JEQ2Z5ph7eQY/ZAAXPQVBzhFvuHUhN+qEGZyY6WoyTr+OrucIyWti0+YOkzP
Qav/xHMaHkv1SzdwZWTZ9l1KN17PydGVvjcawakUff1nQ2/NCc2bbIKtX7cX3T1r
83Ovr8l2Nxp9Taip1t4Mtqmgyt63emCQ0+X8qqCxp+FAE/RdHjpyW718otlzE9PW
CpMy2LGHu1+PljKwrooPMrG2+dGfTCHbyuuCAPWO8vyopaXvx1B303IFpn+zKzAv
FCOx6uoSERl0KGXwcQ3dmbaIUDRPW+8v1ZmBXe09ouEk77hTiKVywr4hoxjLclwY
cjrWkMcHKg7bmJh7Fg==
=eIdH
-----END PGP PUBLIC KEY BLOCK-----

Loading…
Cancel
Save