diff options
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | po/POTFILES.in | 15 | ||||
-rw-r--r-- | po/de.po | 291 | ||||
-rw-r--r-- | po/es.po | 295 | ||||
-rw-r--r-- | po/fr.po | 277 | ||||
-rw-r--r-- | po/it.po | 277 | ||||
-rw-r--r-- | po/sv.po | 295 | ||||
-rw-r--r-- | po/vi.po | 295 | ||||
-rw-r--r-- | po/zh_CN.po | 289 | ||||
-rw-r--r-- | src/Makefile.am | 16 | ||||
-rw-r--r-- | src/abd/Makefile.am (renamed from src/credential/Makefile.am) | 73 | ||||
-rw-r--r-- | src/abd/abd.conf.in | 5 | ||||
-rw-r--r-- | src/abd/abd.h (renamed from src/credential/credential.h) | 27 | ||||
-rw-r--r-- | src/abd/abd_api.c (renamed from src/credential/credential_api.c) | 184 | ||||
-rw-r--r-- | src/abd/abd_serialization.c (renamed from src/credential/credential_serialization.c) | 110 | ||||
-rw-r--r-- | src/abd/abd_serialization.h (renamed from src/credential/credential_serialization.h) | 84 | ||||
-rw-r--r-- | src/abd/delegate_misc.c (renamed from src/credential/delegate_misc.c) | 26 | ||||
-rw-r--r-- | src/abd/delegate_misc.h (renamed from src/credential/delegate_misc.h) | 12 | ||||
-rw-r--r-- | src/abd/gnunet-abd.c (renamed from src/credential/gnunet-credential.c) | 82 | ||||
-rw-r--r-- | src/abd/gnunet-service-abd.c (renamed from src/credential/gnunet-service-credential.c) | 128 | ||||
-rw-r--r-- | src/abd/plugin_gnsrecord_abd.c (renamed from src/credential/plugin_gnsrecord_credential.c) | 65 | ||||
-rw-r--r-- | src/abd/plugin_rest_credential.c (renamed from src/credential/plugin_rest_credential.c) | 0 | ||||
-rwxr-xr-x | src/abd/test_abd_bi_and.sh | 98 | ||||
-rwxr-xr-x | src/abd/test_abd_bi_and2.sh | 94 | ||||
-rwxr-xr-x | src/abd/test_abd_bi_and3.sh | 96 | ||||
-rwxr-xr-x | src/abd/test_abd_bi_and4.sh | 83 | ||||
-rwxr-xr-x | src/abd/test_abd_bi_bw.sh | 87 | ||||
-rwxr-xr-x | src/abd/test_abd_bi_bw_link.sh | 92 | ||||
-rwxr-xr-x | src/abd/test_abd_bi_bw_link2.sh | 93 | ||||
-rwxr-xr-x | src/abd/test_abd_bi_fw.sh | 92 | ||||
-rw-r--r-- | src/abd/test_abd_defaults.conf (renamed from src/credential/test_credential_defaults.conf) | 2 | ||||
-rwxr-xr-x | src/abd/test_abd_issue.sh | 46 | ||||
-rw-r--r-- | src/abd/test_abd_lookup.conf (renamed from src/credential/test_credential_lookup.conf) | 6 | ||||
-rwxr-xr-x | src/abd/test_abd_own.sh | 140 | ||||
-rwxr-xr-x | src/abd/test_abd_verify.sh | 87 | ||||
-rwxr-xr-x | src/abd/test_abd_verify_and.sh | 86 | ||||
-rwxr-xr-x | src/abd/test_abd_verify_simple.sh | 56 | ||||
-rwxr-xr-x | src/abd/test_credential_collect.sh (renamed from src/credential/test_credential_collect.sh) | 0 | ||||
-rwxr-xr-x | src/abd/test_credential_collect_rest.sh (renamed from src/credential/test_credential_collect_rest.sh) | 0 | ||||
-rwxr-xr-x | src/abd/test_credential_issue_rest.sh (renamed from src/credential/test_credential_issue_rest.sh) | 0 | ||||
-rwxr-xr-x | src/abd/test_credential_verify_rest.sh (renamed from src/credential/test_credential_verify_rest.sh) | 0 | ||||
-rw-r--r-- | src/credential/credential.conf.in | 5 | ||||
-rwxr-xr-x | src/credential/test_credential_bi_and.sh | 98 | ||||
-rwxr-xr-x | src/credential/test_credential_bi_and2.sh | 94 | ||||
-rwxr-xr-x | src/credential/test_credential_bi_and3.sh | 96 | ||||
-rwxr-xr-x | src/credential/test_credential_bi_and4.sh | 83 | ||||
-rwxr-xr-x | src/credential/test_credential_bi_bw.sh | 87 | ||||
-rwxr-xr-x | src/credential/test_credential_bi_bw_link.sh | 92 | ||||
-rwxr-xr-x | src/credential/test_credential_bi_bw_link2.sh | 93 | ||||
-rwxr-xr-x | src/credential/test_credential_bi_fw.sh | 92 | ||||
-rwxr-xr-x | src/credential/test_credential_issue.sh | 46 | ||||
-rwxr-xr-x | src/credential/test_credential_own.sh | 140 | ||||
-rwxr-xr-x | src/credential/test_credential_verify.sh | 87 | ||||
-rwxr-xr-x | src/credential/test_credential_verify_and.sh | 87 | ||||
-rwxr-xr-x | src/credential/test_credential_verify_simple.sh | 56 | ||||
-rw-r--r-- | src/include/Makefile.am | 2 | ||||
-rw-r--r-- | src/include/gnunet_abd_service.h (renamed from src/include/gnunet_credential_service.h) | 104 | ||||
-rw-r--r-- | src/include/gnunet_gnsrecord_lib.h | 3 | ||||
-rw-r--r-- | src/include/gnunet_protocols.h | 12 |
59 files changed, 2634 insertions, 2651 deletions
diff --git a/configure.ac b/configure.ac index 95f1020ae..7af7e83df 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1675,8 +1675,8 @@ src/gnsrecord/Makefile | |||
1675 | src/hello/Makefile | 1675 | src/hello/Makefile |
1676 | src/identity/Makefile | 1676 | src/identity/Makefile |
1677 | src/identity/identity.conf | 1677 | src/identity/identity.conf |
1678 | src/credential/Makefile | 1678 | src/abd/Makefile |
1679 | src/credential/credential.conf | 1679 | src/abd/abd.conf |
1680 | src/include/Makefile | 1680 | src/include/Makefile |
1681 | src/integration-tests/Makefile | 1681 | src/integration-tests/Makefile |
1682 | src/json/Makefile | 1682 | src/json/Makefile |
diff --git a/po/POTFILES.in b/po/POTFILES.in index b564be17a..1bffc3b02 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -1,3 +1,11 @@ | |||
1 | src/abd/abd_api.c | ||
2 | src/abd/abd_serialization.c | ||
3 | src/abd/delegate_misc.c | ||
4 | src/abd/gnunet-abd.c | ||
5 | src/abd/gnunet-service-abd.c | ||
6 | src/abd/plugin_gnsrecord_abd.c | ||
7 | src/abd/plugin_rest_abd.c | ||
8 | src/abd/plugin_rest_credential.c | ||
1 | src/abe/abe.c | 9 | src/abe/abe.c |
2 | src/arm/arm_api.c | 10 | src/arm/arm_api.c |
3 | src/arm/arm_monitor_api.c | 11 | src/arm/arm_monitor_api.c |
@@ -86,13 +94,6 @@ src/core/gnunet-service-core.c | |||
86 | src/core/gnunet-service-core_kx.c | 94 | src/core/gnunet-service-core_kx.c |
87 | src/core/gnunet-service-core_sessions.c | 95 | src/core/gnunet-service-core_sessions.c |
88 | src/core/gnunet-service-core_typemap.c | 96 | src/core/gnunet-service-core_typemap.c |
89 | src/credential/credential_api.c | ||
90 | src/credential/credential_serialization.c | ||
91 | src/credential/delegate_misc.c | ||
92 | src/credential/gnunet-credential.c | ||
93 | src/credential/gnunet-service-credential.c | ||
94 | src/credential/plugin_gnsrecord_credential.c | ||
95 | src/credential/plugin_rest_credential.c | ||
96 | src/curl/curl.c | 97 | src/curl/curl.c |
97 | src/curl/curl_reschedule.c | 98 | src/curl/curl_reschedule.c |
98 | src/datacache/datacache.c | 99 | src/datacache/datacache.c |
@@ -10,7 +10,7 @@ msgid "" | |||
10 | msgstr "" | 10 | msgstr "" |
11 | "Project-Id-Version: gnunet 0.10.1\n" | 11 | "Project-Id-Version: gnunet 0.10.1\n" |
12 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 12 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
13 | "POT-Creation-Date: 2019-09-04 12:56+0200\n" | 13 | "POT-Creation-Date: 2019-10-07 11:45+0200\n" |
14 | "PO-Revision-Date: 2015-03-08 16:16+0100\n" | 14 | "PO-Revision-Date: 2015-03-08 16:16+0100\n" |
15 | "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" | 15 | "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" |
16 | "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" | 16 | "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" |
@@ -21,6 +21,144 @@ msgstr "" | |||
21 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" | 21 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
22 | "X-Generator: Poedit 1.7.4\n" | 22 | "X-Generator: Poedit 1.7.4\n" |
23 | 23 | ||
24 | #: src/abd/gnunet-abd.c:394 src/namestore/gnunet-namestore.c:994 | ||
25 | #, fuzzy, c-format | ||
26 | msgid "Ego `%s' not known to identity service\n" | ||
27 | msgstr "`%s': unbekannter Dienst: %s\n" | ||
28 | |||
29 | #: src/abd/gnunet-abd.c:410 src/abd/gnunet-abd.c:875 | ||
30 | #, c-format | ||
31 | msgid "Issuer public key `%s' is not well-formed\n" | ||
32 | msgstr "" | ||
33 | |||
34 | #: src/abd/gnunet-abd.c:549 src/abd/gnunet-service-abd.c:1723 | ||
35 | #: src/namestore/gnunet-namestore.c:1019 | ||
36 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
37 | #, fuzzy, c-format | ||
38 | msgid "Failed to connect to namestore\n" | ||
39 | msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" | ||
40 | |||
41 | #: src/abd/gnunet-abd.c:814 src/abd/gnunet-abd.c:865 | ||
42 | #, fuzzy, c-format | ||
43 | msgid "Issuer public key not well-formed\n" | ||
44 | msgstr "Ungültiger Parameter: `%s'\n" | ||
45 | |||
46 | #: src/abd/gnunet-abd.c:823 src/abd/gnunet-abd.c:884 | ||
47 | #, fuzzy, c-format | ||
48 | msgid "Failed to connect to ABD\n" | ||
49 | msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" | ||
50 | |||
51 | #: src/abd/gnunet-abd.c:829 | ||
52 | #, c-format | ||
53 | msgid "You must provide issuer the attribute\n" | ||
54 | msgstr "" | ||
55 | |||
56 | #: src/abd/gnunet-abd.c:836 | ||
57 | #, fuzzy, c-format | ||
58 | msgid "ego required\n" | ||
59 | msgstr "Gültiger Typ ist erforderlich\n" | ||
60 | |||
61 | #: src/abd/gnunet-abd.c:846 | ||
62 | #, c-format | ||
63 | msgid "Subject public key needed\n" | ||
64 | msgstr "" | ||
65 | |||
66 | #: src/abd/gnunet-abd.c:855 | ||
67 | #, c-format | ||
68 | msgid "Subject public key `%s' is not well-formed\n" | ||
69 | msgstr "" | ||
70 | |||
71 | #: src/abd/gnunet-abd.c:890 | ||
72 | #, c-format | ||
73 | msgid "You must provide issuer and subject attributes\n" | ||
74 | msgstr "" | ||
75 | |||
76 | #: src/abd/gnunet-abd.c:946 | ||
77 | #, c-format | ||
78 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
79 | msgstr "" | ||
80 | |||
81 | #: src/abd/gnunet-abd.c:967 | ||
82 | msgid "verify credential against attribute" | ||
83 | msgstr "" | ||
84 | |||
85 | #: src/abd/gnunet-abd.c:974 | ||
86 | #, fuzzy | ||
87 | msgid "" | ||
88 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
89 | "side storage: subject and its attributes" | ||
90 | msgstr "Die Priorität des Inhalts angeben" | ||
91 | |||
92 | #: src/abd/gnunet-abd.c:981 | ||
93 | msgid "The private, signed delegate presented by the subject" | ||
94 | msgstr "" | ||
95 | |||
96 | #: src/abd/gnunet-abd.c:988 | ||
97 | msgid "The public key of the authority to verify the credential against" | ||
98 | msgstr "" | ||
99 | |||
100 | #: src/abd/gnunet-abd.c:993 | ||
101 | msgid "The ego/zone name to use" | ||
102 | msgstr "" | ||
103 | |||
104 | #: src/abd/gnunet-abd.c:999 | ||
105 | msgid "The issuer attribute to verify against or to issue" | ||
106 | msgstr "" | ||
107 | |||
108 | #: src/abd/gnunet-abd.c:1005 | ||
109 | msgid "" | ||
110 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
111 | msgstr "" | ||
112 | |||
113 | #: src/abd/gnunet-abd.c:1010 | ||
114 | msgid "collect credentials" | ||
115 | msgstr "" | ||
116 | |||
117 | #: src/abd/gnunet-abd.c:1015 | ||
118 | msgid "Create and issue a credential issuer side." | ||
119 | msgstr "" | ||
120 | |||
121 | #: src/abd/gnunet-abd.c:1020 | ||
122 | msgid "Issue a credential subject side." | ||
123 | msgstr "" | ||
124 | |||
125 | #: src/abd/gnunet-abd.c:1025 | ||
126 | msgid "Create, sign and return a credential subject side." | ||
127 | msgstr "" | ||
128 | |||
129 | #: src/abd/gnunet-abd.c:1032 | ||
130 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
131 | msgstr "" | ||
132 | |||
133 | #: src/abd/gnunet-abd.c:1036 | ||
134 | msgid "Create private record entry." | ||
135 | msgstr "" | ||
136 | |||
137 | #: src/abd/gnunet-abd.c:1042 src/abd/gnunet-abd.c:1048 | ||
138 | msgid "Indicates that the collect/verify process is done via forward search." | ||
139 | msgstr "" | ||
140 | |||
141 | #: src/abd/gnunet-abd.c:1061 | ||
142 | #, fuzzy | ||
143 | msgid "GNUnet abd resolver tool" | ||
144 | msgstr "GNUnet Netzwerk Topologie tracen." | ||
145 | |||
146 | #: src/abd/gnunet-service-abd.c:1718 src/gns/gnunet-gns.c:185 | ||
147 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
148 | #, fuzzy, c-format | ||
149 | msgid "Failed to connect to GNS\n" | ||
150 | msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" | ||
151 | |||
152 | #: src/abd/plugin_gnsrecord_abd.c:182 | ||
153 | #, fuzzy, c-format | ||
154 | msgid "Unable to parse ATTR record string `%s'\n" | ||
155 | msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" | ||
156 | |||
157 | #: src/abd/plugin_rest_abd.c:1128 src/abd/plugin_rest_credential.c:1128 | ||
158 | #, fuzzy | ||
159 | msgid "GNS REST API initialized\n" | ||
160 | msgstr " Verbindung fehlgeschlagen\n" | ||
161 | |||
24 | #: src/arm/gnunet-arm.c:156 | 162 | #: src/arm/gnunet-arm.c:156 |
25 | #, fuzzy, c-format | 163 | #, fuzzy, c-format |
26 | msgid "Failed to remove configuration file %s\n" | 164 | msgid "Failed to remove configuration file %s\n" |
@@ -1470,149 +1608,6 @@ msgstr "# Bytes empfangen über TCP" | |||
1470 | msgid "# updates to my type map" | 1608 | msgid "# updates to my type map" |
1471 | msgstr "" | 1609 | msgstr "" |
1472 | 1610 | ||
1473 | #: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994 | ||
1474 | #, fuzzy, c-format | ||
1475 | msgid "Ego `%s' not known to identity service\n" | ||
1476 | msgstr "`%s': unbekannter Dienst: %s\n" | ||
1477 | |||
1478 | #: src/credential/gnunet-credential.c:397 | ||
1479 | #: src/credential/gnunet-credential.c:859 | ||
1480 | #, c-format | ||
1481 | msgid "Issuer public key `%s' is not well-formed\n" | ||
1482 | msgstr "" | ||
1483 | |||
1484 | #: src/credential/gnunet-credential.c:532 | ||
1485 | #: src/credential/gnunet-service-credential.c:1728 | ||
1486 | #: src/namestore/gnunet-namestore.c:1019 | ||
1487 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
1488 | #, fuzzy, c-format | ||
1489 | msgid "Failed to connect to namestore\n" | ||
1490 | msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" | ||
1491 | |||
1492 | #: src/credential/gnunet-credential.c:798 | ||
1493 | #: src/credential/gnunet-credential.c:849 | ||
1494 | #, fuzzy, c-format | ||
1495 | msgid "Issuer public key not well-formed\n" | ||
1496 | msgstr "Ungültiger Parameter: `%s'\n" | ||
1497 | |||
1498 | #: src/credential/gnunet-credential.c:807 | ||
1499 | #: src/credential/gnunet-credential.c:868 | ||
1500 | #, fuzzy, c-format | ||
1501 | msgid "Failed to connect to CREDENTIAL\n" | ||
1502 | msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" | ||
1503 | |||
1504 | #: src/credential/gnunet-credential.c:813 | ||
1505 | #, c-format | ||
1506 | msgid "You must provide issuer the attribute\n" | ||
1507 | msgstr "" | ||
1508 | |||
1509 | #: src/credential/gnunet-credential.c:820 | ||
1510 | #, fuzzy, c-format | ||
1511 | msgid "ego required\n" | ||
1512 | msgstr "Gültiger Typ ist erforderlich\n" | ||
1513 | |||
1514 | #: src/credential/gnunet-credential.c:830 | ||
1515 | #, c-format | ||
1516 | msgid "Subject public key needed\n" | ||
1517 | msgstr "" | ||
1518 | |||
1519 | #: src/credential/gnunet-credential.c:839 | ||
1520 | #, c-format | ||
1521 | msgid "Subject public key `%s' is not well-formed\n" | ||
1522 | msgstr "" | ||
1523 | |||
1524 | #: src/credential/gnunet-credential.c:874 | ||
1525 | #, c-format | ||
1526 | msgid "You must provide issuer and subject attributes\n" | ||
1527 | msgstr "" | ||
1528 | |||
1529 | #: src/credential/gnunet-credential.c:930 | ||
1530 | #, c-format | ||
1531 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
1532 | msgstr "" | ||
1533 | |||
1534 | #: src/credential/gnunet-credential.c:951 | ||
1535 | msgid "verify credential against attribute" | ||
1536 | msgstr "" | ||
1537 | |||
1538 | #: src/credential/gnunet-credential.c:958 | ||
1539 | #, fuzzy | ||
1540 | msgid "" | ||
1541 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
1542 | "side storage: subject and its attributes" | ||
1543 | msgstr "Die Priorität des Inhalts angeben" | ||
1544 | |||
1545 | #: src/credential/gnunet-credential.c:965 | ||
1546 | msgid "The private, signed delegate presented by the subject" | ||
1547 | msgstr "" | ||
1548 | |||
1549 | #: src/credential/gnunet-credential.c:972 | ||
1550 | msgid "The public key of the authority to verify the credential against" | ||
1551 | msgstr "" | ||
1552 | |||
1553 | #: src/credential/gnunet-credential.c:977 | ||
1554 | msgid "The ego/zone name to use" | ||
1555 | msgstr "" | ||
1556 | |||
1557 | #: src/credential/gnunet-credential.c:983 | ||
1558 | msgid "The issuer attribute to verify against or to issue" | ||
1559 | msgstr "" | ||
1560 | |||
1561 | #: src/credential/gnunet-credential.c:989 | ||
1562 | msgid "" | ||
1563 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
1564 | msgstr "" | ||
1565 | |||
1566 | #: src/credential/gnunet-credential.c:994 | ||
1567 | msgid "collect credentials" | ||
1568 | msgstr "" | ||
1569 | |||
1570 | #: src/credential/gnunet-credential.c:999 | ||
1571 | msgid "Create and issue a credential issuer side." | ||
1572 | msgstr "" | ||
1573 | |||
1574 | #: src/credential/gnunet-credential.c:1004 | ||
1575 | msgid "Issue a credential subject side." | ||
1576 | msgstr "" | ||
1577 | |||
1578 | #: src/credential/gnunet-credential.c:1009 | ||
1579 | msgid "Create, sign and return a credential subject side." | ||
1580 | msgstr "" | ||
1581 | |||
1582 | #: src/credential/gnunet-credential.c:1016 | ||
1583 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
1584 | msgstr "" | ||
1585 | |||
1586 | #: src/credential/gnunet-credential.c:1020 | ||
1587 | msgid "Create private record entry." | ||
1588 | msgstr "" | ||
1589 | |||
1590 | #: src/credential/gnunet-credential.c:1026 | ||
1591 | #: src/credential/gnunet-credential.c:1032 | ||
1592 | msgid "Indicates that the collect/verify process is done via forward search." | ||
1593 | msgstr "" | ||
1594 | |||
1595 | #: src/credential/gnunet-credential.c:1045 | ||
1596 | #, fuzzy | ||
1597 | msgid "GNUnet credential resolver tool" | ||
1598 | msgstr "GNUnet Netzwerk Topologie tracen." | ||
1599 | |||
1600 | #: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185 | ||
1601 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
1602 | #, fuzzy, c-format | ||
1603 | msgid "Failed to connect to GNS\n" | ||
1604 | msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" | ||
1605 | |||
1606 | #: src/credential/plugin_gnsrecord_credential.c:182 | ||
1607 | #, fuzzy, c-format | ||
1608 | msgid "Unable to parse ATTR record string `%s'\n" | ||
1609 | msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" | ||
1610 | |||
1611 | #: src/credential/plugin_rest_credential.c:1128 | ||
1612 | #, fuzzy | ||
1613 | msgid "GNS REST API initialized\n" | ||
1614 | msgstr " Verbindung fehlgeschlagen\n" | ||
1615 | |||
1616 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 | 1611 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 |
1617 | #: src/datastore/gnunet-service-datastore.c:757 | 1612 | #: src/datastore/gnunet-service-datastore.c:757 |
1618 | msgid "# bytes stored" | 1613 | msgid "# bytes stored" |
@@ -9105,6 +9100,14 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" | |||
9105 | msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n" | 9100 | msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n" |
9106 | 9101 | ||
9107 | #, fuzzy | 9102 | #, fuzzy |
9103 | #~ msgid "Failed to connect to CREDENTIAL\n" | ||
9104 | #~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" | ||
9105 | |||
9106 | #, fuzzy | ||
9107 | #~ msgid "GNUnet credential resolver tool" | ||
9108 | #~ msgstr "GNUnet Netzwerk Topologie tracen." | ||
9109 | |||
9110 | #, fuzzy | ||
9108 | #~ msgid "Unable to parse CRED record string `%s'\n" | 9111 | #~ msgid "Unable to parse CRED record string `%s'\n" |
9109 | #~ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" | 9112 | #~ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" |
9110 | 9113 | ||
@@ -8,7 +8,7 @@ msgid "" | |||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: gnunet 0.9.5a\n" | 9 | "Project-Id-Version: gnunet 0.9.5a\n" |
10 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 10 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
11 | "POT-Creation-Date: 2019-09-04 12:56+0200\n" | 11 | "POT-Creation-Date: 2019-10-07 11:45+0200\n" |
12 | "PO-Revision-Date: 2013-02-23 17:50+0100\n" | 12 | "PO-Revision-Date: 2013-02-23 17:50+0100\n" |
13 | "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n" | 13 | "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n" |
14 | "Language-Team: Spanish <es@li.org>\n" | 14 | "Language-Team: Spanish <es@li.org>\n" |
@@ -18,6 +18,146 @@ msgstr "" | |||
18 | "Content-Transfer-Encoding: 8bit\n" | 18 | "Content-Transfer-Encoding: 8bit\n" |
19 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" | 19 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
20 | 20 | ||
21 | #: src/abd/gnunet-abd.c:394 src/namestore/gnunet-namestore.c:994 | ||
22 | #, fuzzy, c-format | ||
23 | msgid "Ego `%s' not known to identity service\n" | ||
24 | msgstr "'%s': servicio desconocido: %s\n" | ||
25 | |||
26 | #: src/abd/gnunet-abd.c:410 src/abd/gnunet-abd.c:875 | ||
27 | #, fuzzy, c-format | ||
28 | msgid "Issuer public key `%s' is not well-formed\n" | ||
29 | msgstr "El bloque del tipo %u está mal formado\n" | ||
30 | |||
31 | #: src/abd/gnunet-abd.c:549 src/abd/gnunet-service-abd.c:1723 | ||
32 | #: src/namestore/gnunet-namestore.c:1019 | ||
33 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
34 | #, c-format | ||
35 | msgid "Failed to connect to namestore\n" | ||
36 | msgstr "Se produjo un fallo al conectar con el almacén de nombres\n" | ||
37 | |||
38 | #: src/abd/gnunet-abd.c:814 src/abd/gnunet-abd.c:865 | ||
39 | #, fuzzy, c-format | ||
40 | msgid "Issuer public key not well-formed\n" | ||
41 | msgstr "El bloque del tipo %u está mal formado\n" | ||
42 | |||
43 | #: src/abd/gnunet-abd.c:823 src/abd/gnunet-abd.c:884 | ||
44 | #, fuzzy, c-format | ||
45 | msgid "Failed to connect to ABD\n" | ||
46 | msgstr "Se produjo un fallo al conectar con GNS\n" | ||
47 | |||
48 | #: src/abd/gnunet-abd.c:829 | ||
49 | #, c-format | ||
50 | msgid "You must provide issuer the attribute\n" | ||
51 | msgstr "" | ||
52 | |||
53 | #: src/abd/gnunet-abd.c:836 | ||
54 | #, fuzzy, c-format | ||
55 | msgid "ego required\n" | ||
56 | msgstr "Tipo requerido\n" | ||
57 | |||
58 | #: src/abd/gnunet-abd.c:846 | ||
59 | #, c-format | ||
60 | msgid "Subject public key needed\n" | ||
61 | msgstr "" | ||
62 | |||
63 | #: src/abd/gnunet-abd.c:855 | ||
64 | #, fuzzy, c-format | ||
65 | msgid "Subject public key `%s' is not well-formed\n" | ||
66 | msgstr "El bloque del tipo %u está mal formado\n" | ||
67 | |||
68 | #: src/abd/gnunet-abd.c:890 | ||
69 | #, c-format | ||
70 | msgid "You must provide issuer and subject attributes\n" | ||
71 | msgstr "" | ||
72 | |||
73 | #: src/abd/gnunet-abd.c:946 | ||
74 | #, c-format | ||
75 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
76 | msgstr "" | ||
77 | |||
78 | #: src/abd/gnunet-abd.c:967 | ||
79 | msgid "verify credential against attribute" | ||
80 | msgstr "" | ||
81 | |||
82 | #: src/abd/gnunet-abd.c:974 | ||
83 | #, fuzzy | ||
84 | msgid "" | ||
85 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
86 | "side storage: subject and its attributes" | ||
87 | msgstr "Especificar el tipo del registro a buscar" | ||
88 | |||
89 | #: src/abd/gnunet-abd.c:981 | ||
90 | msgid "The private, signed delegate presented by the subject" | ||
91 | msgstr "" | ||
92 | |||
93 | #: src/abd/gnunet-abd.c:988 | ||
94 | #, fuzzy | ||
95 | msgid "The public key of the authority to verify the credential against" | ||
96 | msgstr "Especificar el tipo del registro a buscar" | ||
97 | |||
98 | #: src/abd/gnunet-abd.c:993 | ||
99 | #, fuzzy | ||
100 | msgid "The ego/zone name to use" | ||
101 | msgstr "tamaño del mensaje" | ||
102 | |||
103 | #: src/abd/gnunet-abd.c:999 | ||
104 | msgid "The issuer attribute to verify against or to issue" | ||
105 | msgstr "" | ||
106 | |||
107 | #: src/abd/gnunet-abd.c:1005 | ||
108 | msgid "" | ||
109 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
110 | msgstr "" | ||
111 | |||
112 | #: src/abd/gnunet-abd.c:1010 | ||
113 | msgid "collect credentials" | ||
114 | msgstr "" | ||
115 | |||
116 | #: src/abd/gnunet-abd.c:1015 | ||
117 | msgid "Create and issue a credential issuer side." | ||
118 | msgstr "" | ||
119 | |||
120 | #: src/abd/gnunet-abd.c:1020 | ||
121 | msgid "Issue a credential subject side." | ||
122 | msgstr "" | ||
123 | |||
124 | #: src/abd/gnunet-abd.c:1025 | ||
125 | msgid "Create, sign and return a credential subject side." | ||
126 | msgstr "" | ||
127 | |||
128 | #: src/abd/gnunet-abd.c:1032 | ||
129 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
130 | msgstr "" | ||
131 | |||
132 | #: src/abd/gnunet-abd.c:1036 | ||
133 | msgid "Create private record entry." | ||
134 | msgstr "" | ||
135 | |||
136 | #: src/abd/gnunet-abd.c:1042 src/abd/gnunet-abd.c:1048 | ||
137 | msgid "Indicates that the collect/verify process is done via forward search." | ||
138 | msgstr "" | ||
139 | |||
140 | #: src/abd/gnunet-abd.c:1061 | ||
141 | #, fuzzy | ||
142 | msgid "GNUnet abd resolver tool" | ||
143 | msgstr "Herramienta de acceso GNUnet GNS" | ||
144 | |||
145 | #: src/abd/gnunet-service-abd.c:1718 src/gns/gnunet-gns.c:185 | ||
146 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
147 | #, c-format | ||
148 | msgid "Failed to connect to GNS\n" | ||
149 | msgstr "Se produjo un fallo al conectar con GNS\n" | ||
150 | |||
151 | #: src/abd/plugin_gnsrecord_abd.c:182 | ||
152 | #, fuzzy, c-format | ||
153 | msgid "Unable to parse ATTR record string `%s'\n" | ||
154 | msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n" | ||
155 | |||
156 | #: src/abd/plugin_rest_abd.c:1128 src/abd/plugin_rest_credential.c:1128 | ||
157 | #, fuzzy | ||
158 | msgid "GNS REST API initialized\n" | ||
159 | msgstr "Conexión fallida\n" | ||
160 | |||
21 | #: src/arm/gnunet-arm.c:156 | 161 | #: src/arm/gnunet-arm.c:156 |
22 | #, c-format | 162 | #, c-format |
23 | msgid "Failed to remove configuration file %s\n" | 163 | msgid "Failed to remove configuration file %s\n" |
@@ -1544,151 +1684,6 @@ msgstr "# mapas de tipos recibidos" | |||
1544 | msgid "# updates to my type map" | 1684 | msgid "# updates to my type map" |
1545 | msgstr "# actualizaciones de mi mapa de tipos" | 1685 | msgstr "# actualizaciones de mi mapa de tipos" |
1546 | 1686 | ||
1547 | #: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994 | ||
1548 | #, fuzzy, c-format | ||
1549 | msgid "Ego `%s' not known to identity service\n" | ||
1550 | msgstr "'%s': servicio desconocido: %s\n" | ||
1551 | |||
1552 | #: src/credential/gnunet-credential.c:397 | ||
1553 | #: src/credential/gnunet-credential.c:859 | ||
1554 | #, fuzzy, c-format | ||
1555 | msgid "Issuer public key `%s' is not well-formed\n" | ||
1556 | msgstr "El bloque del tipo %u está mal formado\n" | ||
1557 | |||
1558 | #: src/credential/gnunet-credential.c:532 | ||
1559 | #: src/credential/gnunet-service-credential.c:1728 | ||
1560 | #: src/namestore/gnunet-namestore.c:1019 | ||
1561 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
1562 | #, c-format | ||
1563 | msgid "Failed to connect to namestore\n" | ||
1564 | msgstr "Se produjo un fallo al conectar con el almacén de nombres\n" | ||
1565 | |||
1566 | #: src/credential/gnunet-credential.c:798 | ||
1567 | #: src/credential/gnunet-credential.c:849 | ||
1568 | #, fuzzy, c-format | ||
1569 | msgid "Issuer public key not well-formed\n" | ||
1570 | msgstr "El bloque del tipo %u está mal formado\n" | ||
1571 | |||
1572 | #: src/credential/gnunet-credential.c:807 | ||
1573 | #: src/credential/gnunet-credential.c:868 | ||
1574 | #, fuzzy, c-format | ||
1575 | msgid "Failed to connect to CREDENTIAL\n" | ||
1576 | msgstr "Se produjo un fallo al conectar con GNS\n" | ||
1577 | |||
1578 | #: src/credential/gnunet-credential.c:813 | ||
1579 | #, c-format | ||
1580 | msgid "You must provide issuer the attribute\n" | ||
1581 | msgstr "" | ||
1582 | |||
1583 | #: src/credential/gnunet-credential.c:820 | ||
1584 | #, fuzzy, c-format | ||
1585 | msgid "ego required\n" | ||
1586 | msgstr "Tipo requerido\n" | ||
1587 | |||
1588 | #: src/credential/gnunet-credential.c:830 | ||
1589 | #, c-format | ||
1590 | msgid "Subject public key needed\n" | ||
1591 | msgstr "" | ||
1592 | |||
1593 | #: src/credential/gnunet-credential.c:839 | ||
1594 | #, fuzzy, c-format | ||
1595 | msgid "Subject public key `%s' is not well-formed\n" | ||
1596 | msgstr "El bloque del tipo %u está mal formado\n" | ||
1597 | |||
1598 | #: src/credential/gnunet-credential.c:874 | ||
1599 | #, c-format | ||
1600 | msgid "You must provide issuer and subject attributes\n" | ||
1601 | msgstr "" | ||
1602 | |||
1603 | #: src/credential/gnunet-credential.c:930 | ||
1604 | #, c-format | ||
1605 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
1606 | msgstr "" | ||
1607 | |||
1608 | #: src/credential/gnunet-credential.c:951 | ||
1609 | msgid "verify credential against attribute" | ||
1610 | msgstr "" | ||
1611 | |||
1612 | #: src/credential/gnunet-credential.c:958 | ||
1613 | #, fuzzy | ||
1614 | msgid "" | ||
1615 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
1616 | "side storage: subject and its attributes" | ||
1617 | msgstr "Especificar el tipo del registro a buscar" | ||
1618 | |||
1619 | #: src/credential/gnunet-credential.c:965 | ||
1620 | msgid "The private, signed delegate presented by the subject" | ||
1621 | msgstr "" | ||
1622 | |||
1623 | #: src/credential/gnunet-credential.c:972 | ||
1624 | #, fuzzy | ||
1625 | msgid "The public key of the authority to verify the credential against" | ||
1626 | msgstr "Especificar el tipo del registro a buscar" | ||
1627 | |||
1628 | #: src/credential/gnunet-credential.c:977 | ||
1629 | #, fuzzy | ||
1630 | msgid "The ego/zone name to use" | ||
1631 | msgstr "tamaño del mensaje" | ||
1632 | |||
1633 | #: src/credential/gnunet-credential.c:983 | ||
1634 | msgid "The issuer attribute to verify against or to issue" | ||
1635 | msgstr "" | ||
1636 | |||
1637 | #: src/credential/gnunet-credential.c:989 | ||
1638 | msgid "" | ||
1639 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
1640 | msgstr "" | ||
1641 | |||
1642 | #: src/credential/gnunet-credential.c:994 | ||
1643 | msgid "collect credentials" | ||
1644 | msgstr "" | ||
1645 | |||
1646 | #: src/credential/gnunet-credential.c:999 | ||
1647 | msgid "Create and issue a credential issuer side." | ||
1648 | msgstr "" | ||
1649 | |||
1650 | #: src/credential/gnunet-credential.c:1004 | ||
1651 | msgid "Issue a credential subject side." | ||
1652 | msgstr "" | ||
1653 | |||
1654 | #: src/credential/gnunet-credential.c:1009 | ||
1655 | msgid "Create, sign and return a credential subject side." | ||
1656 | msgstr "" | ||
1657 | |||
1658 | #: src/credential/gnunet-credential.c:1016 | ||
1659 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
1660 | msgstr "" | ||
1661 | |||
1662 | #: src/credential/gnunet-credential.c:1020 | ||
1663 | msgid "Create private record entry." | ||
1664 | msgstr "" | ||
1665 | |||
1666 | #: src/credential/gnunet-credential.c:1026 | ||
1667 | #: src/credential/gnunet-credential.c:1032 | ||
1668 | msgid "Indicates that the collect/verify process is done via forward search." | ||
1669 | msgstr "" | ||
1670 | |||
1671 | #: src/credential/gnunet-credential.c:1045 | ||
1672 | #, fuzzy | ||
1673 | msgid "GNUnet credential resolver tool" | ||
1674 | msgstr "Herramienta de acceso GNUnet GNS" | ||
1675 | |||
1676 | #: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185 | ||
1677 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
1678 | #, c-format | ||
1679 | msgid "Failed to connect to GNS\n" | ||
1680 | msgstr "Se produjo un fallo al conectar con GNS\n" | ||
1681 | |||
1682 | #: src/credential/plugin_gnsrecord_credential.c:182 | ||
1683 | #, fuzzy, c-format | ||
1684 | msgid "Unable to parse ATTR record string `%s'\n" | ||
1685 | msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n" | ||
1686 | |||
1687 | #: src/credential/plugin_rest_credential.c:1128 | ||
1688 | #, fuzzy | ||
1689 | msgid "GNS REST API initialized\n" | ||
1690 | msgstr "Conexión fallida\n" | ||
1691 | |||
1692 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 | 1687 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 |
1693 | #: src/datastore/gnunet-service-datastore.c:757 | 1688 | #: src/datastore/gnunet-service-datastore.c:757 |
1694 | msgid "# bytes stored" | 1689 | msgid "# bytes stored" |
@@ -9450,6 +9445,14 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" | |||
9450 | msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n" | 9445 | msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n" |
9451 | 9446 | ||
9452 | #, fuzzy | 9447 | #, fuzzy |
9448 | #~ msgid "Failed to connect to CREDENTIAL\n" | ||
9449 | #~ msgstr "Se produjo un fallo al conectar con GNS\n" | ||
9450 | |||
9451 | #, fuzzy | ||
9452 | #~ msgid "GNUnet credential resolver tool" | ||
9453 | #~ msgstr "Herramienta de acceso GNUnet GNS" | ||
9454 | |||
9455 | #, fuzzy | ||
9453 | #~ msgid "Unable to parse CRED record string `%s'\n" | 9456 | #~ msgid "Unable to parse CRED record string `%s'\n" |
9454 | #~ msgstr "No se pudo procesar la cadena de registro VPN «%s»\n" | 9457 | #~ msgstr "No se pudo procesar la cadena de registro VPN «%s»\n" |
9455 | 9458 | ||
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: gnunet 0.10.1\n" | 8 | "Project-Id-Version: gnunet 0.10.1\n" |
9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
10 | "POT-Creation-Date: 2019-09-04 12:56+0200\n" | 10 | "POT-Creation-Date: 2019-10-07 11:45+0200\n" |
11 | "PO-Revision-Date: 2015-12-24 01:20+0100\n" | 11 | "PO-Revision-Date: 2015-12-24 01:20+0100\n" |
12 | "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n" | 12 | "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n" |
13 | "Language-Team: French <traduc@traduc.org>\n" | 13 | "Language-Team: French <traduc@traduc.org>\n" |
@@ -16,6 +16,141 @@ msgstr "" | |||
16 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
17 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
18 | 18 | ||
19 | #: src/abd/gnunet-abd.c:394 src/namestore/gnunet-namestore.c:994 | ||
20 | #, c-format | ||
21 | msgid "Ego `%s' not known to identity service\n" | ||
22 | msgstr "" | ||
23 | |||
24 | #: src/abd/gnunet-abd.c:410 src/abd/gnunet-abd.c:875 | ||
25 | #, c-format | ||
26 | msgid "Issuer public key `%s' is not well-formed\n" | ||
27 | msgstr "" | ||
28 | |||
29 | #: src/abd/gnunet-abd.c:549 src/abd/gnunet-service-abd.c:1723 | ||
30 | #: src/namestore/gnunet-namestore.c:1019 | ||
31 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
32 | #, c-format | ||
33 | msgid "Failed to connect to namestore\n" | ||
34 | msgstr "" | ||
35 | |||
36 | #: src/abd/gnunet-abd.c:814 src/abd/gnunet-abd.c:865 | ||
37 | #, c-format | ||
38 | msgid "Issuer public key not well-formed\n" | ||
39 | msgstr "" | ||
40 | |||
41 | #: src/abd/gnunet-abd.c:823 src/abd/gnunet-abd.c:884 | ||
42 | #, fuzzy, c-format | ||
43 | msgid "Failed to connect to ABD\n" | ||
44 | msgstr "Impossible d’ouvrir « %s ».\n" | ||
45 | |||
46 | #: src/abd/gnunet-abd.c:829 | ||
47 | #, c-format | ||
48 | msgid "You must provide issuer the attribute\n" | ||
49 | msgstr "" | ||
50 | |||
51 | #: src/abd/gnunet-abd.c:836 | ||
52 | #, c-format | ||
53 | msgid "ego required\n" | ||
54 | msgstr "" | ||
55 | |||
56 | #: src/abd/gnunet-abd.c:846 | ||
57 | #, c-format | ||
58 | msgid "Subject public key needed\n" | ||
59 | msgstr "" | ||
60 | |||
61 | #: src/abd/gnunet-abd.c:855 | ||
62 | #, c-format | ||
63 | msgid "Subject public key `%s' is not well-formed\n" | ||
64 | msgstr "" | ||
65 | |||
66 | #: src/abd/gnunet-abd.c:890 | ||
67 | #, c-format | ||
68 | msgid "You must provide issuer and subject attributes\n" | ||
69 | msgstr "" | ||
70 | |||
71 | #: src/abd/gnunet-abd.c:946 | ||
72 | #, c-format | ||
73 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
74 | msgstr "" | ||
75 | |||
76 | #: src/abd/gnunet-abd.c:967 | ||
77 | msgid "verify credential against attribute" | ||
78 | msgstr "" | ||
79 | |||
80 | #: src/abd/gnunet-abd.c:974 | ||
81 | msgid "" | ||
82 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
83 | "side storage: subject and its attributes" | ||
84 | msgstr "" | ||
85 | |||
86 | #: src/abd/gnunet-abd.c:981 | ||
87 | msgid "The private, signed delegate presented by the subject" | ||
88 | msgstr "" | ||
89 | |||
90 | #: src/abd/gnunet-abd.c:988 | ||
91 | msgid "The public key of the authority to verify the credential against" | ||
92 | msgstr "" | ||
93 | |||
94 | #: src/abd/gnunet-abd.c:993 | ||
95 | msgid "The ego/zone name to use" | ||
96 | msgstr "" | ||
97 | |||
98 | #: src/abd/gnunet-abd.c:999 | ||
99 | msgid "The issuer attribute to verify against or to issue" | ||
100 | msgstr "" | ||
101 | |||
102 | #: src/abd/gnunet-abd.c:1005 | ||
103 | msgid "" | ||
104 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
105 | msgstr "" | ||
106 | |||
107 | #: src/abd/gnunet-abd.c:1010 | ||
108 | msgid "collect credentials" | ||
109 | msgstr "" | ||
110 | |||
111 | #: src/abd/gnunet-abd.c:1015 | ||
112 | msgid "Create and issue a credential issuer side." | ||
113 | msgstr "" | ||
114 | |||
115 | #: src/abd/gnunet-abd.c:1020 | ||
116 | msgid "Issue a credential subject side." | ||
117 | msgstr "" | ||
118 | |||
119 | #: src/abd/gnunet-abd.c:1025 | ||
120 | msgid "Create, sign and return a credential subject side." | ||
121 | msgstr "" | ||
122 | |||
123 | #: src/abd/gnunet-abd.c:1032 | ||
124 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
125 | msgstr "" | ||
126 | |||
127 | #: src/abd/gnunet-abd.c:1036 | ||
128 | msgid "Create private record entry." | ||
129 | msgstr "" | ||
130 | |||
131 | #: src/abd/gnunet-abd.c:1042 src/abd/gnunet-abd.c:1048 | ||
132 | msgid "Indicates that the collect/verify process is done via forward search." | ||
133 | msgstr "" | ||
134 | |||
135 | #: src/abd/gnunet-abd.c:1061 | ||
136 | msgid "GNUnet abd resolver tool" | ||
137 | msgstr "" | ||
138 | |||
139 | #: src/abd/gnunet-service-abd.c:1718 src/gns/gnunet-gns.c:185 | ||
140 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
141 | #, c-format | ||
142 | msgid "Failed to connect to GNS\n" | ||
143 | msgstr "" | ||
144 | |||
145 | #: src/abd/plugin_gnsrecord_abd.c:182 | ||
146 | #, fuzzy, c-format | ||
147 | msgid "Unable to parse ATTR record string `%s'\n" | ||
148 | msgstr "Résolution de « %s » échouée\n" | ||
149 | |||
150 | #: src/abd/plugin_rest_abd.c:1128 src/abd/plugin_rest_credential.c:1128 | ||
151 | msgid "GNS REST API initialized\n" | ||
152 | msgstr "" | ||
153 | |||
19 | #: src/arm/gnunet-arm.c:156 | 154 | #: src/arm/gnunet-arm.c:156 |
20 | #, c-format | 155 | #, c-format |
21 | msgid "Failed to remove configuration file %s\n" | 156 | msgid "Failed to remove configuration file %s\n" |
@@ -1424,146 +1559,6 @@ msgstr "" | |||
1424 | msgid "# updates to my type map" | 1559 | msgid "# updates to my type map" |
1425 | msgstr "" | 1560 | msgstr "" |
1426 | 1561 | ||
1427 | #: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994 | ||
1428 | #, c-format | ||
1429 | msgid "Ego `%s' not known to identity service\n" | ||
1430 | msgstr "" | ||
1431 | |||
1432 | #: src/credential/gnunet-credential.c:397 | ||
1433 | #: src/credential/gnunet-credential.c:859 | ||
1434 | #, c-format | ||
1435 | msgid "Issuer public key `%s' is not well-formed\n" | ||
1436 | msgstr "" | ||
1437 | |||
1438 | #: src/credential/gnunet-credential.c:532 | ||
1439 | #: src/credential/gnunet-service-credential.c:1728 | ||
1440 | #: src/namestore/gnunet-namestore.c:1019 | ||
1441 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
1442 | #, c-format | ||
1443 | msgid "Failed to connect to namestore\n" | ||
1444 | msgstr "" | ||
1445 | |||
1446 | #: src/credential/gnunet-credential.c:798 | ||
1447 | #: src/credential/gnunet-credential.c:849 | ||
1448 | #, c-format | ||
1449 | msgid "Issuer public key not well-formed\n" | ||
1450 | msgstr "" | ||
1451 | |||
1452 | #: src/credential/gnunet-credential.c:807 | ||
1453 | #: src/credential/gnunet-credential.c:868 | ||
1454 | #, fuzzy, c-format | ||
1455 | msgid "Failed to connect to CREDENTIAL\n" | ||
1456 | msgstr "Impossible d’ouvrir « %s ».\n" | ||
1457 | |||
1458 | #: src/credential/gnunet-credential.c:813 | ||
1459 | #, c-format | ||
1460 | msgid "You must provide issuer the attribute\n" | ||
1461 | msgstr "" | ||
1462 | |||
1463 | #: src/credential/gnunet-credential.c:820 | ||
1464 | #, c-format | ||
1465 | msgid "ego required\n" | ||
1466 | msgstr "" | ||
1467 | |||
1468 | #: src/credential/gnunet-credential.c:830 | ||
1469 | #, c-format | ||
1470 | msgid "Subject public key needed\n" | ||
1471 | msgstr "" | ||
1472 | |||
1473 | #: src/credential/gnunet-credential.c:839 | ||
1474 | #, c-format | ||
1475 | msgid "Subject public key `%s' is not well-formed\n" | ||
1476 | msgstr "" | ||
1477 | |||
1478 | #: src/credential/gnunet-credential.c:874 | ||
1479 | #, c-format | ||
1480 | msgid "You must provide issuer and subject attributes\n" | ||
1481 | msgstr "" | ||
1482 | |||
1483 | #: src/credential/gnunet-credential.c:930 | ||
1484 | #, c-format | ||
1485 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
1486 | msgstr "" | ||
1487 | |||
1488 | #: src/credential/gnunet-credential.c:951 | ||
1489 | msgid "verify credential against attribute" | ||
1490 | msgstr "" | ||
1491 | |||
1492 | #: src/credential/gnunet-credential.c:958 | ||
1493 | msgid "" | ||
1494 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
1495 | "side storage: subject and its attributes" | ||
1496 | msgstr "" | ||
1497 | |||
1498 | #: src/credential/gnunet-credential.c:965 | ||
1499 | msgid "The private, signed delegate presented by the subject" | ||
1500 | msgstr "" | ||
1501 | |||
1502 | #: src/credential/gnunet-credential.c:972 | ||
1503 | msgid "The public key of the authority to verify the credential against" | ||
1504 | msgstr "" | ||
1505 | |||
1506 | #: src/credential/gnunet-credential.c:977 | ||
1507 | msgid "The ego/zone name to use" | ||
1508 | msgstr "" | ||
1509 | |||
1510 | #: src/credential/gnunet-credential.c:983 | ||
1511 | msgid "The issuer attribute to verify against or to issue" | ||
1512 | msgstr "" | ||
1513 | |||
1514 | #: src/credential/gnunet-credential.c:989 | ||
1515 | msgid "" | ||
1516 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
1517 | msgstr "" | ||
1518 | |||
1519 | #: src/credential/gnunet-credential.c:994 | ||
1520 | msgid "collect credentials" | ||
1521 | msgstr "" | ||
1522 | |||
1523 | #: src/credential/gnunet-credential.c:999 | ||
1524 | msgid "Create and issue a credential issuer side." | ||
1525 | msgstr "" | ||
1526 | |||
1527 | #: src/credential/gnunet-credential.c:1004 | ||
1528 | msgid "Issue a credential subject side." | ||
1529 | msgstr "" | ||
1530 | |||
1531 | #: src/credential/gnunet-credential.c:1009 | ||
1532 | msgid "Create, sign and return a credential subject side." | ||
1533 | msgstr "" | ||
1534 | |||
1535 | #: src/credential/gnunet-credential.c:1016 | ||
1536 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
1537 | msgstr "" | ||
1538 | |||
1539 | #: src/credential/gnunet-credential.c:1020 | ||
1540 | msgid "Create private record entry." | ||
1541 | msgstr "" | ||
1542 | |||
1543 | #: src/credential/gnunet-credential.c:1026 | ||
1544 | #: src/credential/gnunet-credential.c:1032 | ||
1545 | msgid "Indicates that the collect/verify process is done via forward search." | ||
1546 | msgstr "" | ||
1547 | |||
1548 | #: src/credential/gnunet-credential.c:1045 | ||
1549 | msgid "GNUnet credential resolver tool" | ||
1550 | msgstr "" | ||
1551 | |||
1552 | #: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185 | ||
1553 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
1554 | #, c-format | ||
1555 | msgid "Failed to connect to GNS\n" | ||
1556 | msgstr "" | ||
1557 | |||
1558 | #: src/credential/plugin_gnsrecord_credential.c:182 | ||
1559 | #, fuzzy, c-format | ||
1560 | msgid "Unable to parse ATTR record string `%s'\n" | ||
1561 | msgstr "Résolution de « %s » échouée\n" | ||
1562 | |||
1563 | #: src/credential/plugin_rest_credential.c:1128 | ||
1564 | msgid "GNS REST API initialized\n" | ||
1565 | msgstr "" | ||
1566 | |||
1567 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 | 1562 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 |
1568 | #: src/datastore/gnunet-service-datastore.c:757 | 1563 | #: src/datastore/gnunet-service-datastore.c:757 |
1569 | msgid "# bytes stored" | 1564 | msgid "# bytes stored" |
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: gnunet 0.10.1\n" | 8 | "Project-Id-Version: gnunet 0.10.1\n" |
9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
10 | "POT-Creation-Date: 2019-09-04 12:56+0200\n" | 10 | "POT-Creation-Date: 2019-10-07 11:45+0200\n" |
11 | "PO-Revision-Date: 2018-08-29 13:48+0200\n" | 11 | "PO-Revision-Date: 2018-08-29 13:48+0200\n" |
12 | "Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n" | 12 | "Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n" |
13 | "Language-Team: Italian <tp@lists.linux.it>\n" | 13 | "Language-Team: Italian <tp@lists.linux.it>\n" |
@@ -20,6 +20,141 @@ msgstr "" | |||
20 | "X-Generator: Poedit 2.0.7\n" | 20 | "X-Generator: Poedit 2.0.7\n" |
21 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" | 21 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
22 | 22 | ||
23 | #: src/abd/gnunet-abd.c:394 src/namestore/gnunet-namestore.c:994 | ||
24 | #, c-format | ||
25 | msgid "Ego `%s' not known to identity service\n" | ||
26 | msgstr "" | ||
27 | |||
28 | #: src/abd/gnunet-abd.c:410 src/abd/gnunet-abd.c:875 | ||
29 | #, c-format | ||
30 | msgid "Issuer public key `%s' is not well-formed\n" | ||
31 | msgstr "" | ||
32 | |||
33 | #: src/abd/gnunet-abd.c:549 src/abd/gnunet-service-abd.c:1723 | ||
34 | #: src/namestore/gnunet-namestore.c:1019 | ||
35 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
36 | #, c-format | ||
37 | msgid "Failed to connect to namestore\n" | ||
38 | msgstr "" | ||
39 | |||
40 | #: src/abd/gnunet-abd.c:814 src/abd/gnunet-abd.c:865 | ||
41 | #, c-format | ||
42 | msgid "Issuer public key not well-formed\n" | ||
43 | msgstr "" | ||
44 | |||
45 | #: src/abd/gnunet-abd.c:823 src/abd/gnunet-abd.c:884 | ||
46 | #, fuzzy, c-format | ||
47 | msgid "Failed to connect to ABD\n" | ||
48 | msgstr "# connessioni attive" | ||
49 | |||
50 | #: src/abd/gnunet-abd.c:829 | ||
51 | #, c-format | ||
52 | msgid "You must provide issuer the attribute\n" | ||
53 | msgstr "" | ||
54 | |||
55 | #: src/abd/gnunet-abd.c:836 | ||
56 | #, c-format | ||
57 | msgid "ego required\n" | ||
58 | msgstr "" | ||
59 | |||
60 | #: src/abd/gnunet-abd.c:846 | ||
61 | #, c-format | ||
62 | msgid "Subject public key needed\n" | ||
63 | msgstr "" | ||
64 | |||
65 | #: src/abd/gnunet-abd.c:855 | ||
66 | #, c-format | ||
67 | msgid "Subject public key `%s' is not well-formed\n" | ||
68 | msgstr "" | ||
69 | |||
70 | #: src/abd/gnunet-abd.c:890 | ||
71 | #, c-format | ||
72 | msgid "You must provide issuer and subject attributes\n" | ||
73 | msgstr "" | ||
74 | |||
75 | #: src/abd/gnunet-abd.c:946 | ||
76 | #, c-format | ||
77 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
78 | msgstr "" | ||
79 | |||
80 | #: src/abd/gnunet-abd.c:967 | ||
81 | msgid "verify credential against attribute" | ||
82 | msgstr "" | ||
83 | |||
84 | #: src/abd/gnunet-abd.c:974 | ||
85 | msgid "" | ||
86 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
87 | "side storage: subject and its attributes" | ||
88 | msgstr "" | ||
89 | |||
90 | #: src/abd/gnunet-abd.c:981 | ||
91 | msgid "The private, signed delegate presented by the subject" | ||
92 | msgstr "" | ||
93 | |||
94 | #: src/abd/gnunet-abd.c:988 | ||
95 | msgid "The public key of the authority to verify the credential against" | ||
96 | msgstr "" | ||
97 | |||
98 | #: src/abd/gnunet-abd.c:993 | ||
99 | msgid "The ego/zone name to use" | ||
100 | msgstr "" | ||
101 | |||
102 | #: src/abd/gnunet-abd.c:999 | ||
103 | msgid "The issuer attribute to verify against or to issue" | ||
104 | msgstr "" | ||
105 | |||
106 | #: src/abd/gnunet-abd.c:1005 | ||
107 | msgid "" | ||
108 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
109 | msgstr "" | ||
110 | |||
111 | #: src/abd/gnunet-abd.c:1010 | ||
112 | msgid "collect credentials" | ||
113 | msgstr "" | ||
114 | |||
115 | #: src/abd/gnunet-abd.c:1015 | ||
116 | msgid "Create and issue a credential issuer side." | ||
117 | msgstr "" | ||
118 | |||
119 | #: src/abd/gnunet-abd.c:1020 | ||
120 | msgid "Issue a credential subject side." | ||
121 | msgstr "" | ||
122 | |||
123 | #: src/abd/gnunet-abd.c:1025 | ||
124 | msgid "Create, sign and return a credential subject side." | ||
125 | msgstr "" | ||
126 | |||
127 | #: src/abd/gnunet-abd.c:1032 | ||
128 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
129 | msgstr "" | ||
130 | |||
131 | #: src/abd/gnunet-abd.c:1036 | ||
132 | msgid "Create private record entry." | ||
133 | msgstr "" | ||
134 | |||
135 | #: src/abd/gnunet-abd.c:1042 src/abd/gnunet-abd.c:1048 | ||
136 | msgid "Indicates that the collect/verify process is done via forward search." | ||
137 | msgstr "" | ||
138 | |||
139 | #: src/abd/gnunet-abd.c:1061 | ||
140 | msgid "GNUnet abd resolver tool" | ||
141 | msgstr "" | ||
142 | |||
143 | #: src/abd/gnunet-service-abd.c:1718 src/gns/gnunet-gns.c:185 | ||
144 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
145 | #, c-format | ||
146 | msgid "Failed to connect to GNS\n" | ||
147 | msgstr "" | ||
148 | |||
149 | #: src/abd/plugin_gnsrecord_abd.c:182 | ||
150 | #, c-format | ||
151 | msgid "Unable to parse ATTR record string `%s'\n" | ||
152 | msgstr "" | ||
153 | |||
154 | #: src/abd/plugin_rest_abd.c:1128 src/abd/plugin_rest_credential.c:1128 | ||
155 | msgid "GNS REST API initialized\n" | ||
156 | msgstr "" | ||
157 | |||
23 | #: src/arm/gnunet-arm.c:156 | 158 | #: src/arm/gnunet-arm.c:156 |
24 | #, c-format | 159 | #, c-format |
25 | msgid "Failed to remove configuration file %s\n" | 160 | msgid "Failed to remove configuration file %s\n" |
@@ -1422,146 +1557,6 @@ msgstr "" | |||
1422 | msgid "# updates to my type map" | 1557 | msgid "# updates to my type map" |
1423 | msgstr "" | 1558 | msgstr "" |
1424 | 1559 | ||
1425 | #: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994 | ||
1426 | #, c-format | ||
1427 | msgid "Ego `%s' not known to identity service\n" | ||
1428 | msgstr "" | ||
1429 | |||
1430 | #: src/credential/gnunet-credential.c:397 | ||
1431 | #: src/credential/gnunet-credential.c:859 | ||
1432 | #, c-format | ||
1433 | msgid "Issuer public key `%s' is not well-formed\n" | ||
1434 | msgstr "" | ||
1435 | |||
1436 | #: src/credential/gnunet-credential.c:532 | ||
1437 | #: src/credential/gnunet-service-credential.c:1728 | ||
1438 | #: src/namestore/gnunet-namestore.c:1019 | ||
1439 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
1440 | #, c-format | ||
1441 | msgid "Failed to connect to namestore\n" | ||
1442 | msgstr "" | ||
1443 | |||
1444 | #: src/credential/gnunet-credential.c:798 | ||
1445 | #: src/credential/gnunet-credential.c:849 | ||
1446 | #, c-format | ||
1447 | msgid "Issuer public key not well-formed\n" | ||
1448 | msgstr "" | ||
1449 | |||
1450 | #: src/credential/gnunet-credential.c:807 | ||
1451 | #: src/credential/gnunet-credential.c:868 | ||
1452 | #, c-format | ||
1453 | msgid "Failed to connect to CREDENTIAL\n" | ||
1454 | msgstr "" | ||
1455 | |||
1456 | #: src/credential/gnunet-credential.c:813 | ||
1457 | #, c-format | ||
1458 | msgid "You must provide issuer the attribute\n" | ||
1459 | msgstr "" | ||
1460 | |||
1461 | #: src/credential/gnunet-credential.c:820 | ||
1462 | #, c-format | ||
1463 | msgid "ego required\n" | ||
1464 | msgstr "" | ||
1465 | |||
1466 | #: src/credential/gnunet-credential.c:830 | ||
1467 | #, c-format | ||
1468 | msgid "Subject public key needed\n" | ||
1469 | msgstr "" | ||
1470 | |||
1471 | #: src/credential/gnunet-credential.c:839 | ||
1472 | #, c-format | ||
1473 | msgid "Subject public key `%s' is not well-formed\n" | ||
1474 | msgstr "" | ||
1475 | |||
1476 | #: src/credential/gnunet-credential.c:874 | ||
1477 | #, c-format | ||
1478 | msgid "You must provide issuer and subject attributes\n" | ||
1479 | msgstr "" | ||
1480 | |||
1481 | #: src/credential/gnunet-credential.c:930 | ||
1482 | #, c-format | ||
1483 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
1484 | msgstr "" | ||
1485 | |||
1486 | #: src/credential/gnunet-credential.c:951 | ||
1487 | msgid "verify credential against attribute" | ||
1488 | msgstr "" | ||
1489 | |||
1490 | #: src/credential/gnunet-credential.c:958 | ||
1491 | msgid "" | ||
1492 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
1493 | "side storage: subject and its attributes" | ||
1494 | msgstr "" | ||
1495 | |||
1496 | #: src/credential/gnunet-credential.c:965 | ||
1497 | msgid "The private, signed delegate presented by the subject" | ||
1498 | msgstr "" | ||
1499 | |||
1500 | #: src/credential/gnunet-credential.c:972 | ||
1501 | msgid "The public key of the authority to verify the credential against" | ||
1502 | msgstr "" | ||
1503 | |||
1504 | #: src/credential/gnunet-credential.c:977 | ||
1505 | msgid "The ego/zone name to use" | ||
1506 | msgstr "" | ||
1507 | |||
1508 | #: src/credential/gnunet-credential.c:983 | ||
1509 | msgid "The issuer attribute to verify against or to issue" | ||
1510 | msgstr "" | ||
1511 | |||
1512 | #: src/credential/gnunet-credential.c:989 | ||
1513 | msgid "" | ||
1514 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
1515 | msgstr "" | ||
1516 | |||
1517 | #: src/credential/gnunet-credential.c:994 | ||
1518 | msgid "collect credentials" | ||
1519 | msgstr "" | ||
1520 | |||
1521 | #: src/credential/gnunet-credential.c:999 | ||
1522 | msgid "Create and issue a credential issuer side." | ||
1523 | msgstr "" | ||
1524 | |||
1525 | #: src/credential/gnunet-credential.c:1004 | ||
1526 | msgid "Issue a credential subject side." | ||
1527 | msgstr "" | ||
1528 | |||
1529 | #: src/credential/gnunet-credential.c:1009 | ||
1530 | msgid "Create, sign and return a credential subject side." | ||
1531 | msgstr "" | ||
1532 | |||
1533 | #: src/credential/gnunet-credential.c:1016 | ||
1534 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
1535 | msgstr "" | ||
1536 | |||
1537 | #: src/credential/gnunet-credential.c:1020 | ||
1538 | msgid "Create private record entry." | ||
1539 | msgstr "" | ||
1540 | |||
1541 | #: src/credential/gnunet-credential.c:1026 | ||
1542 | #: src/credential/gnunet-credential.c:1032 | ||
1543 | msgid "Indicates that the collect/verify process is done via forward search." | ||
1544 | msgstr "" | ||
1545 | |||
1546 | #: src/credential/gnunet-credential.c:1045 | ||
1547 | msgid "GNUnet credential resolver tool" | ||
1548 | msgstr "" | ||
1549 | |||
1550 | #: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185 | ||
1551 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
1552 | #, c-format | ||
1553 | msgid "Failed to connect to GNS\n" | ||
1554 | msgstr "" | ||
1555 | |||
1556 | #: src/credential/plugin_gnsrecord_credential.c:182 | ||
1557 | #, c-format | ||
1558 | msgid "Unable to parse ATTR record string `%s'\n" | ||
1559 | msgstr "" | ||
1560 | |||
1561 | #: src/credential/plugin_rest_credential.c:1128 | ||
1562 | msgid "GNS REST API initialized\n" | ||
1563 | msgstr "" | ||
1564 | |||
1565 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 | 1560 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 |
1566 | #: src/datastore/gnunet-service-datastore.c:757 | 1561 | #: src/datastore/gnunet-service-datastore.c:757 |
1567 | msgid "# bytes stored" | 1562 | msgid "# bytes stored" |
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: GNUnet 0.7.0b\n" | 8 | "Project-Id-Version: GNUnet 0.7.0b\n" |
9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
10 | "POT-Creation-Date: 2019-09-04 12:56+0200\n" | 10 | "POT-Creation-Date: 2019-10-07 11:45+0200\n" |
11 | "PO-Revision-Date: 2006-01-21 17:16+0100\n" | 11 | "PO-Revision-Date: 2006-01-21 17:16+0100\n" |
12 | "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" | 12 | "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" |
13 | "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" | 13 | "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" |
@@ -16,6 +16,146 @@ msgstr "" | |||
16 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
17 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
18 | 18 | ||
19 | #: src/abd/gnunet-abd.c:394 src/namestore/gnunet-namestore.c:994 | ||
20 | #, fuzzy, c-format | ||
21 | msgid "Ego `%s' not known to identity service\n" | ||
22 | msgstr "\"%s\": okänd tjänst: %s\n" | ||
23 | |||
24 | #: src/abd/gnunet-abd.c:410 src/abd/gnunet-abd.c:875 | ||
25 | #, fuzzy, c-format | ||
26 | msgid "Issuer public key `%s' is not well-formed\n" | ||
27 | msgstr "Ogiltigt argument: \"%s\"\n" | ||
28 | |||
29 | #: src/abd/gnunet-abd.c:549 src/abd/gnunet-service-abd.c:1723 | ||
30 | #: src/namestore/gnunet-namestore.c:1019 | ||
31 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
32 | #, fuzzy, c-format | ||
33 | msgid "Failed to connect to namestore\n" | ||
34 | msgstr "Misslyckades att ansluta till gnunetd.\n" | ||
35 | |||
36 | #: src/abd/gnunet-abd.c:814 src/abd/gnunet-abd.c:865 | ||
37 | #, fuzzy, c-format | ||
38 | msgid "Issuer public key not well-formed\n" | ||
39 | msgstr "Ogiltigt argument: \"%s\"\n" | ||
40 | |||
41 | #: src/abd/gnunet-abd.c:823 src/abd/gnunet-abd.c:884 | ||
42 | #, fuzzy, c-format | ||
43 | msgid "Failed to connect to ABD\n" | ||
44 | msgstr "Misslyckades att ansluta till gnunetd.\n" | ||
45 | |||
46 | #: src/abd/gnunet-abd.c:829 | ||
47 | #, c-format | ||
48 | msgid "You must provide issuer the attribute\n" | ||
49 | msgstr "" | ||
50 | |||
51 | #: src/abd/gnunet-abd.c:836 | ||
52 | #, c-format | ||
53 | msgid "ego required\n" | ||
54 | msgstr "" | ||
55 | |||
56 | #: src/abd/gnunet-abd.c:846 | ||
57 | #, c-format | ||
58 | msgid "Subject public key needed\n" | ||
59 | msgstr "" | ||
60 | |||
61 | #: src/abd/gnunet-abd.c:855 | ||
62 | #, fuzzy, c-format | ||
63 | msgid "Subject public key `%s' is not well-formed\n" | ||
64 | msgstr "Ogiltigt argument: \"%s\"\n" | ||
65 | |||
66 | #: src/abd/gnunet-abd.c:890 | ||
67 | #, c-format | ||
68 | msgid "You must provide issuer and subject attributes\n" | ||
69 | msgstr "" | ||
70 | |||
71 | #: src/abd/gnunet-abd.c:946 | ||
72 | #, c-format | ||
73 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
74 | msgstr "" | ||
75 | |||
76 | #: src/abd/gnunet-abd.c:967 | ||
77 | msgid "verify credential against attribute" | ||
78 | msgstr "" | ||
79 | |||
80 | #: src/abd/gnunet-abd.c:974 | ||
81 | #, fuzzy | ||
82 | msgid "" | ||
83 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
84 | "side storage: subject and its attributes" | ||
85 | msgstr "ange prioritet för innehållet" | ||
86 | |||
87 | #: src/abd/gnunet-abd.c:981 | ||
88 | msgid "The private, signed delegate presented by the subject" | ||
89 | msgstr "" | ||
90 | |||
91 | #: src/abd/gnunet-abd.c:988 | ||
92 | #, fuzzy | ||
93 | msgid "The public key of the authority to verify the credential against" | ||
94 | msgstr "ange prioritet för innehållet" | ||
95 | |||
96 | #: src/abd/gnunet-abd.c:993 | ||
97 | #, fuzzy | ||
98 | msgid "The ego/zone name to use" | ||
99 | msgstr "meddelandestorlek" | ||
100 | |||
101 | #: src/abd/gnunet-abd.c:999 | ||
102 | msgid "The issuer attribute to verify against or to issue" | ||
103 | msgstr "" | ||
104 | |||
105 | #: src/abd/gnunet-abd.c:1005 | ||
106 | msgid "" | ||
107 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
108 | msgstr "" | ||
109 | |||
110 | #: src/abd/gnunet-abd.c:1010 | ||
111 | msgid "collect credentials" | ||
112 | msgstr "" | ||
113 | |||
114 | #: src/abd/gnunet-abd.c:1015 | ||
115 | msgid "Create and issue a credential issuer side." | ||
116 | msgstr "" | ||
117 | |||
118 | #: src/abd/gnunet-abd.c:1020 | ||
119 | msgid "Issue a credential subject side." | ||
120 | msgstr "" | ||
121 | |||
122 | #: src/abd/gnunet-abd.c:1025 | ||
123 | msgid "Create, sign and return a credential subject side." | ||
124 | msgstr "" | ||
125 | |||
126 | #: src/abd/gnunet-abd.c:1032 | ||
127 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
128 | msgstr "" | ||
129 | |||
130 | #: src/abd/gnunet-abd.c:1036 | ||
131 | msgid "Create private record entry." | ||
132 | msgstr "" | ||
133 | |||
134 | #: src/abd/gnunet-abd.c:1042 src/abd/gnunet-abd.c:1048 | ||
135 | msgid "Indicates that the collect/verify process is done via forward search." | ||
136 | msgstr "" | ||
137 | |||
138 | #: src/abd/gnunet-abd.c:1061 | ||
139 | #, fuzzy | ||
140 | msgid "GNUnet abd resolver tool" | ||
141 | msgstr "Spåra GNUnets nätverkstopologi." | ||
142 | |||
143 | #: src/abd/gnunet-service-abd.c:1718 src/gns/gnunet-gns.c:185 | ||
144 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
145 | #, fuzzy, c-format | ||
146 | msgid "Failed to connect to GNS\n" | ||
147 | msgstr "Misslyckades att ansluta till gnunetd.\n" | ||
148 | |||
149 | #: src/abd/plugin_gnsrecord_abd.c:182 | ||
150 | #, fuzzy, c-format | ||
151 | msgid "Unable to parse ATTR record string `%s'\n" | ||
152 | msgstr "Misslyckades att läsa kompislista från \"%s\"\n" | ||
153 | |||
154 | #: src/abd/plugin_rest_abd.c:1128 src/abd/plugin_rest_credential.c:1128 | ||
155 | #, fuzzy | ||
156 | msgid "GNS REST API initialized\n" | ||
157 | msgstr " Anslutning misslyckades\n" | ||
158 | |||
19 | #: src/arm/gnunet-arm.c:156 | 159 | #: src/arm/gnunet-arm.c:156 |
20 | #, fuzzy, c-format | 160 | #, fuzzy, c-format |
21 | msgid "Failed to remove configuration file %s\n" | 161 | msgid "Failed to remove configuration file %s\n" |
@@ -1497,151 +1637,6 @@ msgstr "# krypterade PONG-meddelanden mottagna" | |||
1497 | msgid "# updates to my type map" | 1637 | msgid "# updates to my type map" |
1498 | msgstr "" | 1638 | msgstr "" |
1499 | 1639 | ||
1500 | #: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994 | ||
1501 | #, fuzzy, c-format | ||
1502 | msgid "Ego `%s' not known to identity service\n" | ||
1503 | msgstr "\"%s\": okänd tjänst: %s\n" | ||
1504 | |||
1505 | #: src/credential/gnunet-credential.c:397 | ||
1506 | #: src/credential/gnunet-credential.c:859 | ||
1507 | #, fuzzy, c-format | ||
1508 | msgid "Issuer public key `%s' is not well-formed\n" | ||
1509 | msgstr "Ogiltigt argument: \"%s\"\n" | ||
1510 | |||
1511 | #: src/credential/gnunet-credential.c:532 | ||
1512 | #: src/credential/gnunet-service-credential.c:1728 | ||
1513 | #: src/namestore/gnunet-namestore.c:1019 | ||
1514 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
1515 | #, fuzzy, c-format | ||
1516 | msgid "Failed to connect to namestore\n" | ||
1517 | msgstr "Misslyckades att ansluta till gnunetd.\n" | ||
1518 | |||
1519 | #: src/credential/gnunet-credential.c:798 | ||
1520 | #: src/credential/gnunet-credential.c:849 | ||
1521 | #, fuzzy, c-format | ||
1522 | msgid "Issuer public key not well-formed\n" | ||
1523 | msgstr "Ogiltigt argument: \"%s\"\n" | ||
1524 | |||
1525 | #: src/credential/gnunet-credential.c:807 | ||
1526 | #: src/credential/gnunet-credential.c:868 | ||
1527 | #, fuzzy, c-format | ||
1528 | msgid "Failed to connect to CREDENTIAL\n" | ||
1529 | msgstr "Misslyckades att ansluta till gnunetd.\n" | ||
1530 | |||
1531 | #: src/credential/gnunet-credential.c:813 | ||
1532 | #, c-format | ||
1533 | msgid "You must provide issuer the attribute\n" | ||
1534 | msgstr "" | ||
1535 | |||
1536 | #: src/credential/gnunet-credential.c:820 | ||
1537 | #, c-format | ||
1538 | msgid "ego required\n" | ||
1539 | msgstr "" | ||
1540 | |||
1541 | #: src/credential/gnunet-credential.c:830 | ||
1542 | #, c-format | ||
1543 | msgid "Subject public key needed\n" | ||
1544 | msgstr "" | ||
1545 | |||
1546 | #: src/credential/gnunet-credential.c:839 | ||
1547 | #, fuzzy, c-format | ||
1548 | msgid "Subject public key `%s' is not well-formed\n" | ||
1549 | msgstr "Ogiltigt argument: \"%s\"\n" | ||
1550 | |||
1551 | #: src/credential/gnunet-credential.c:874 | ||
1552 | #, c-format | ||
1553 | msgid "You must provide issuer and subject attributes\n" | ||
1554 | msgstr "" | ||
1555 | |||
1556 | #: src/credential/gnunet-credential.c:930 | ||
1557 | #, c-format | ||
1558 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
1559 | msgstr "" | ||
1560 | |||
1561 | #: src/credential/gnunet-credential.c:951 | ||
1562 | msgid "verify credential against attribute" | ||
1563 | msgstr "" | ||
1564 | |||
1565 | #: src/credential/gnunet-credential.c:958 | ||
1566 | #, fuzzy | ||
1567 | msgid "" | ||
1568 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
1569 | "side storage: subject and its attributes" | ||
1570 | msgstr "ange prioritet för innehållet" | ||
1571 | |||
1572 | #: src/credential/gnunet-credential.c:965 | ||
1573 | msgid "The private, signed delegate presented by the subject" | ||
1574 | msgstr "" | ||
1575 | |||
1576 | #: src/credential/gnunet-credential.c:972 | ||
1577 | #, fuzzy | ||
1578 | msgid "The public key of the authority to verify the credential against" | ||
1579 | msgstr "ange prioritet för innehållet" | ||
1580 | |||
1581 | #: src/credential/gnunet-credential.c:977 | ||
1582 | #, fuzzy | ||
1583 | msgid "The ego/zone name to use" | ||
1584 | msgstr "meddelandestorlek" | ||
1585 | |||
1586 | #: src/credential/gnunet-credential.c:983 | ||
1587 | msgid "The issuer attribute to verify against or to issue" | ||
1588 | msgstr "" | ||
1589 | |||
1590 | #: src/credential/gnunet-credential.c:989 | ||
1591 | msgid "" | ||
1592 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
1593 | msgstr "" | ||
1594 | |||
1595 | #: src/credential/gnunet-credential.c:994 | ||
1596 | msgid "collect credentials" | ||
1597 | msgstr "" | ||
1598 | |||
1599 | #: src/credential/gnunet-credential.c:999 | ||
1600 | msgid "Create and issue a credential issuer side." | ||
1601 | msgstr "" | ||
1602 | |||
1603 | #: src/credential/gnunet-credential.c:1004 | ||
1604 | msgid "Issue a credential subject side." | ||
1605 | msgstr "" | ||
1606 | |||
1607 | #: src/credential/gnunet-credential.c:1009 | ||
1608 | msgid "Create, sign and return a credential subject side." | ||
1609 | msgstr "" | ||
1610 | |||
1611 | #: src/credential/gnunet-credential.c:1016 | ||
1612 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
1613 | msgstr "" | ||
1614 | |||
1615 | #: src/credential/gnunet-credential.c:1020 | ||
1616 | msgid "Create private record entry." | ||
1617 | msgstr "" | ||
1618 | |||
1619 | #: src/credential/gnunet-credential.c:1026 | ||
1620 | #: src/credential/gnunet-credential.c:1032 | ||
1621 | msgid "Indicates that the collect/verify process is done via forward search." | ||
1622 | msgstr "" | ||
1623 | |||
1624 | #: src/credential/gnunet-credential.c:1045 | ||
1625 | #, fuzzy | ||
1626 | msgid "GNUnet credential resolver tool" | ||
1627 | msgstr "Spåra GNUnets nätverkstopologi." | ||
1628 | |||
1629 | #: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185 | ||
1630 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
1631 | #, fuzzy, c-format | ||
1632 | msgid "Failed to connect to GNS\n" | ||
1633 | msgstr "Misslyckades att ansluta till gnunetd.\n" | ||
1634 | |||
1635 | #: src/credential/plugin_gnsrecord_credential.c:182 | ||
1636 | #, fuzzy, c-format | ||
1637 | msgid "Unable to parse ATTR record string `%s'\n" | ||
1638 | msgstr "Misslyckades att läsa kompislista från \"%s\"\n" | ||
1639 | |||
1640 | #: src/credential/plugin_rest_credential.c:1128 | ||
1641 | #, fuzzy | ||
1642 | msgid "GNS REST API initialized\n" | ||
1643 | msgstr " Anslutning misslyckades\n" | ||
1644 | |||
1645 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 | 1640 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 |
1646 | #: src/datastore/gnunet-service-datastore.c:757 | 1641 | #: src/datastore/gnunet-service-datastore.c:757 |
1647 | #, fuzzy | 1642 | #, fuzzy |
@@ -9207,6 +9202,14 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" | |||
9207 | msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n" | 9202 | msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n" |
9208 | 9203 | ||
9209 | #, fuzzy | 9204 | #, fuzzy |
9205 | #~ msgid "Failed to connect to CREDENTIAL\n" | ||
9206 | #~ msgstr "Misslyckades att ansluta till gnunetd.\n" | ||
9207 | |||
9208 | #, fuzzy | ||
9209 | #~ msgid "GNUnet credential resolver tool" | ||
9210 | #~ msgstr "Spåra GNUnets nätverkstopologi." | ||
9211 | |||
9212 | #, fuzzy | ||
9210 | #~ msgid "Unable to parse CRED record string `%s'\n" | 9213 | #~ msgid "Unable to parse CRED record string `%s'\n" |
9211 | #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n" | 9214 | #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n" |
9212 | 9215 | ||
@@ -8,7 +8,7 @@ msgid "" | |||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: gnunet 0.8.0a\n" | 9 | "Project-Id-Version: gnunet 0.8.0a\n" |
10 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 10 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
11 | "POT-Creation-Date: 2019-09-04 12:56+0200\n" | 11 | "POT-Creation-Date: 2019-10-07 11:45+0200\n" |
12 | "PO-Revision-Date: 2008-09-10 22:05+0930\n" | 12 | "PO-Revision-Date: 2008-09-10 22:05+0930\n" |
13 | "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" | 13 | "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" |
14 | "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" | 14 | "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" |
@@ -19,6 +19,146 @@ msgstr "" | |||
19 | "Plural-Forms: nplurals=1; plural=0;\n" | 19 | "Plural-Forms: nplurals=1; plural=0;\n" |
20 | "X-Generator: LocFactoryEditor 1.7b3\n" | 20 | "X-Generator: LocFactoryEditor 1.7b3\n" |
21 | 21 | ||
22 | #: src/abd/gnunet-abd.c:394 src/namestore/gnunet-namestore.c:994 | ||
23 | #, c-format | ||
24 | msgid "Ego `%s' not known to identity service\n" | ||
25 | msgstr "" | ||
26 | |||
27 | #: src/abd/gnunet-abd.c:410 src/abd/gnunet-abd.c:875 | ||
28 | #, fuzzy, c-format | ||
29 | msgid "Issuer public key `%s' is not well-formed\n" | ||
30 | msgstr "Đối số không hợp lệ cho « %s ».\n" | ||
31 | |||
32 | #: src/abd/gnunet-abd.c:549 src/abd/gnunet-service-abd.c:1723 | ||
33 | #: src/namestore/gnunet-namestore.c:1019 | ||
34 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
35 | #, fuzzy, c-format | ||
36 | msgid "Failed to connect to namestore\n" | ||
37 | msgstr "Không kết nối được đến trình nền gnunetd." | ||
38 | |||
39 | #: src/abd/gnunet-abd.c:814 src/abd/gnunet-abd.c:865 | ||
40 | #, fuzzy, c-format | ||
41 | msgid "Issuer public key not well-formed\n" | ||
42 | msgstr "Đối số không hợp lệ cho « %s ».\n" | ||
43 | |||
44 | #: src/abd/gnunet-abd.c:823 src/abd/gnunet-abd.c:884 | ||
45 | #, fuzzy, c-format | ||
46 | msgid "Failed to connect to ABD\n" | ||
47 | msgstr "Lỗi kết nối đến gnunetd.\n" | ||
48 | |||
49 | #: src/abd/gnunet-abd.c:829 | ||
50 | #, c-format | ||
51 | msgid "You must provide issuer the attribute\n" | ||
52 | msgstr "" | ||
53 | |||
54 | #: src/abd/gnunet-abd.c:836 | ||
55 | #, c-format | ||
56 | msgid "ego required\n" | ||
57 | msgstr "" | ||
58 | |||
59 | #: src/abd/gnunet-abd.c:846 | ||
60 | #, c-format | ||
61 | msgid "Subject public key needed\n" | ||
62 | msgstr "" | ||
63 | |||
64 | #: src/abd/gnunet-abd.c:855 | ||
65 | #, fuzzy, c-format | ||
66 | msgid "Subject public key `%s' is not well-formed\n" | ||
67 | msgstr "Đối số không hợp lệ cho « %s ».\n" | ||
68 | |||
69 | #: src/abd/gnunet-abd.c:890 | ||
70 | #, c-format | ||
71 | msgid "You must provide issuer and subject attributes\n" | ||
72 | msgstr "" | ||
73 | |||
74 | #: src/abd/gnunet-abd.c:946 | ||
75 | #, c-format | ||
76 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
77 | msgstr "" | ||
78 | |||
79 | #: src/abd/gnunet-abd.c:967 | ||
80 | msgid "verify credential against attribute" | ||
81 | msgstr "" | ||
82 | |||
83 | #: src/abd/gnunet-abd.c:974 | ||
84 | #, fuzzy | ||
85 | msgid "" | ||
86 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
87 | "side storage: subject and its attributes" | ||
88 | msgstr "xác định mức ưu tiên của nội dung" | ||
89 | |||
90 | #: src/abd/gnunet-abd.c:981 | ||
91 | msgid "The private, signed delegate presented by the subject" | ||
92 | msgstr "" | ||
93 | |||
94 | #: src/abd/gnunet-abd.c:988 | ||
95 | #, fuzzy | ||
96 | msgid "The public key of the authority to verify the credential against" | ||
97 | msgstr "xác định mức ưu tiên của nội dung" | ||
98 | |||
99 | #: src/abd/gnunet-abd.c:993 | ||
100 | #, fuzzy | ||
101 | msgid "The ego/zone name to use" | ||
102 | msgstr "kích cỡ tin nhắn" | ||
103 | |||
104 | #: src/abd/gnunet-abd.c:999 | ||
105 | msgid "The issuer attribute to verify against or to issue" | ||
106 | msgstr "" | ||
107 | |||
108 | #: src/abd/gnunet-abd.c:1005 | ||
109 | msgid "" | ||
110 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
111 | msgstr "" | ||
112 | |||
113 | #: src/abd/gnunet-abd.c:1010 | ||
114 | msgid "collect credentials" | ||
115 | msgstr "" | ||
116 | |||
117 | #: src/abd/gnunet-abd.c:1015 | ||
118 | msgid "Create and issue a credential issuer side." | ||
119 | msgstr "" | ||
120 | |||
121 | #: src/abd/gnunet-abd.c:1020 | ||
122 | msgid "Issue a credential subject side." | ||
123 | msgstr "" | ||
124 | |||
125 | #: src/abd/gnunet-abd.c:1025 | ||
126 | msgid "Create, sign and return a credential subject side." | ||
127 | msgstr "" | ||
128 | |||
129 | #: src/abd/gnunet-abd.c:1032 | ||
130 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
131 | msgstr "" | ||
132 | |||
133 | #: src/abd/gnunet-abd.c:1036 | ||
134 | msgid "Create private record entry." | ||
135 | msgstr "" | ||
136 | |||
137 | #: src/abd/gnunet-abd.c:1042 src/abd/gnunet-abd.c:1048 | ||
138 | msgid "Indicates that the collect/verify process is done via forward search." | ||
139 | msgstr "" | ||
140 | |||
141 | #: src/abd/gnunet-abd.c:1061 | ||
142 | #, fuzzy | ||
143 | msgid "GNUnet abd resolver tool" | ||
144 | msgstr "Bản ghi lỗi GNUnet" | ||
145 | |||
146 | #: src/abd/gnunet-service-abd.c:1718 src/gns/gnunet-gns.c:185 | ||
147 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
148 | #, fuzzy, c-format | ||
149 | msgid "Failed to connect to GNS\n" | ||
150 | msgstr "Lỗi kết nối đến gnunetd.\n" | ||
151 | |||
152 | #: src/abd/plugin_gnsrecord_abd.c:182 | ||
153 | #, fuzzy, c-format | ||
154 | msgid "Unable to parse ATTR record string `%s'\n" | ||
155 | msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" | ||
156 | |||
157 | #: src/abd/plugin_rest_abd.c:1128 src/abd/plugin_rest_credential.c:1128 | ||
158 | #, fuzzy | ||
159 | msgid "GNS REST API initialized\n" | ||
160 | msgstr "Lỗi sơ khởi lõi.\n" | ||
161 | |||
22 | #: src/arm/gnunet-arm.c:156 | 162 | #: src/arm/gnunet-arm.c:156 |
23 | #, fuzzy, c-format | 163 | #, fuzzy, c-format |
24 | msgid "Failed to remove configuration file %s\n" | 164 | msgid "Failed to remove configuration file %s\n" |
@@ -1506,151 +1646,6 @@ msgstr "# các thông báo phát hiện dht được nhận" | |||
1506 | msgid "# updates to my type map" | 1646 | msgid "# updates to my type map" |
1507 | msgstr "" | 1647 | msgstr "" |
1508 | 1648 | ||
1509 | #: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994 | ||
1510 | #, c-format | ||
1511 | msgid "Ego `%s' not known to identity service\n" | ||
1512 | msgstr "" | ||
1513 | |||
1514 | #: src/credential/gnunet-credential.c:397 | ||
1515 | #: src/credential/gnunet-credential.c:859 | ||
1516 | #, fuzzy, c-format | ||
1517 | msgid "Issuer public key `%s' is not well-formed\n" | ||
1518 | msgstr "Đối số không hợp lệ cho « %s ».\n" | ||
1519 | |||
1520 | #: src/credential/gnunet-credential.c:532 | ||
1521 | #: src/credential/gnunet-service-credential.c:1728 | ||
1522 | #: src/namestore/gnunet-namestore.c:1019 | ||
1523 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
1524 | #, fuzzy, c-format | ||
1525 | msgid "Failed to connect to namestore\n" | ||
1526 | msgstr "Không kết nối được đến trình nền gnunetd." | ||
1527 | |||
1528 | #: src/credential/gnunet-credential.c:798 | ||
1529 | #: src/credential/gnunet-credential.c:849 | ||
1530 | #, fuzzy, c-format | ||
1531 | msgid "Issuer public key not well-formed\n" | ||
1532 | msgstr "Đối số không hợp lệ cho « %s ».\n" | ||
1533 | |||
1534 | #: src/credential/gnunet-credential.c:807 | ||
1535 | #: src/credential/gnunet-credential.c:868 | ||
1536 | #, fuzzy, c-format | ||
1537 | msgid "Failed to connect to CREDENTIAL\n" | ||
1538 | msgstr "Lỗi kết nối đến gnunetd.\n" | ||
1539 | |||
1540 | #: src/credential/gnunet-credential.c:813 | ||
1541 | #, c-format | ||
1542 | msgid "You must provide issuer the attribute\n" | ||
1543 | msgstr "" | ||
1544 | |||
1545 | #: src/credential/gnunet-credential.c:820 | ||
1546 | #, c-format | ||
1547 | msgid "ego required\n" | ||
1548 | msgstr "" | ||
1549 | |||
1550 | #: src/credential/gnunet-credential.c:830 | ||
1551 | #, c-format | ||
1552 | msgid "Subject public key needed\n" | ||
1553 | msgstr "" | ||
1554 | |||
1555 | #: src/credential/gnunet-credential.c:839 | ||
1556 | #, fuzzy, c-format | ||
1557 | msgid "Subject public key `%s' is not well-formed\n" | ||
1558 | msgstr "Đối số không hợp lệ cho « %s ».\n" | ||
1559 | |||
1560 | #: src/credential/gnunet-credential.c:874 | ||
1561 | #, c-format | ||
1562 | msgid "You must provide issuer and subject attributes\n" | ||
1563 | msgstr "" | ||
1564 | |||
1565 | #: src/credential/gnunet-credential.c:930 | ||
1566 | #, c-format | ||
1567 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
1568 | msgstr "" | ||
1569 | |||
1570 | #: src/credential/gnunet-credential.c:951 | ||
1571 | msgid "verify credential against attribute" | ||
1572 | msgstr "" | ||
1573 | |||
1574 | #: src/credential/gnunet-credential.c:958 | ||
1575 | #, fuzzy | ||
1576 | msgid "" | ||
1577 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
1578 | "side storage: subject and its attributes" | ||
1579 | msgstr "xác định mức ưu tiên của nội dung" | ||
1580 | |||
1581 | #: src/credential/gnunet-credential.c:965 | ||
1582 | msgid "The private, signed delegate presented by the subject" | ||
1583 | msgstr "" | ||
1584 | |||
1585 | #: src/credential/gnunet-credential.c:972 | ||
1586 | #, fuzzy | ||
1587 | msgid "The public key of the authority to verify the credential against" | ||
1588 | msgstr "xác định mức ưu tiên của nội dung" | ||
1589 | |||
1590 | #: src/credential/gnunet-credential.c:977 | ||
1591 | #, fuzzy | ||
1592 | msgid "The ego/zone name to use" | ||
1593 | msgstr "kích cỡ tin nhắn" | ||
1594 | |||
1595 | #: src/credential/gnunet-credential.c:983 | ||
1596 | msgid "The issuer attribute to verify against or to issue" | ||
1597 | msgstr "" | ||
1598 | |||
1599 | #: src/credential/gnunet-credential.c:989 | ||
1600 | msgid "" | ||
1601 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
1602 | msgstr "" | ||
1603 | |||
1604 | #: src/credential/gnunet-credential.c:994 | ||
1605 | msgid "collect credentials" | ||
1606 | msgstr "" | ||
1607 | |||
1608 | #: src/credential/gnunet-credential.c:999 | ||
1609 | msgid "Create and issue a credential issuer side." | ||
1610 | msgstr "" | ||
1611 | |||
1612 | #: src/credential/gnunet-credential.c:1004 | ||
1613 | msgid "Issue a credential subject side." | ||
1614 | msgstr "" | ||
1615 | |||
1616 | #: src/credential/gnunet-credential.c:1009 | ||
1617 | msgid "Create, sign and return a credential subject side." | ||
1618 | msgstr "" | ||
1619 | |||
1620 | #: src/credential/gnunet-credential.c:1016 | ||
1621 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
1622 | msgstr "" | ||
1623 | |||
1624 | #: src/credential/gnunet-credential.c:1020 | ||
1625 | msgid "Create private record entry." | ||
1626 | msgstr "" | ||
1627 | |||
1628 | #: src/credential/gnunet-credential.c:1026 | ||
1629 | #: src/credential/gnunet-credential.c:1032 | ||
1630 | msgid "Indicates that the collect/verify process is done via forward search." | ||
1631 | msgstr "" | ||
1632 | |||
1633 | #: src/credential/gnunet-credential.c:1045 | ||
1634 | #, fuzzy | ||
1635 | msgid "GNUnet credential resolver tool" | ||
1636 | msgstr "Bản ghi lỗi GNUnet" | ||
1637 | |||
1638 | #: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185 | ||
1639 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
1640 | #, fuzzy, c-format | ||
1641 | msgid "Failed to connect to GNS\n" | ||
1642 | msgstr "Lỗi kết nối đến gnunetd.\n" | ||
1643 | |||
1644 | #: src/credential/plugin_gnsrecord_credential.c:182 | ||
1645 | #, fuzzy, c-format | ||
1646 | msgid "Unable to parse ATTR record string `%s'\n" | ||
1647 | msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" | ||
1648 | |||
1649 | #: src/credential/plugin_rest_credential.c:1128 | ||
1650 | #, fuzzy | ||
1651 | msgid "GNS REST API initialized\n" | ||
1652 | msgstr "Lỗi sơ khởi lõi.\n" | ||
1653 | |||
1654 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 | 1649 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 |
1655 | #: src/datastore/gnunet-service-datastore.c:757 | 1650 | #: src/datastore/gnunet-service-datastore.c:757 |
1656 | #, fuzzy | 1651 | #, fuzzy |
@@ -9264,6 +9259,14 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" | |||
9264 | msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n" | 9259 | msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n" |
9265 | 9260 | ||
9266 | #, fuzzy | 9261 | #, fuzzy |
9262 | #~ msgid "Failed to connect to CREDENTIAL\n" | ||
9263 | #~ msgstr "Lỗi kết nối đến gnunetd.\n" | ||
9264 | |||
9265 | #, fuzzy | ||
9266 | #~ msgid "GNUnet credential resolver tool" | ||
9267 | #~ msgstr "Bản ghi lỗi GNUnet" | ||
9268 | |||
9269 | #, fuzzy | ||
9267 | #~ msgid "Unable to parse CRED record string `%s'\n" | 9270 | #~ msgid "Unable to parse CRED record string `%s'\n" |
9268 | #~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" | 9271 | #~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" |
9269 | 9272 | ||
diff --git a/po/zh_CN.po b/po/zh_CN.po index d592a836c..8f566cd25 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po | |||
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: gnunet-0.8.1\n" | 8 | "Project-Id-Version: gnunet-0.8.1\n" |
9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
10 | "POT-Creation-Date: 2019-09-04 12:56+0200\n" | 10 | "POT-Creation-Date: 2019-10-07 11:45+0200\n" |
11 | "PO-Revision-Date: 2011-07-09 12:12+0800\n" | 11 | "PO-Revision-Date: 2011-07-09 12:12+0800\n" |
12 | "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n" | 12 | "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n" |
13 | "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" | 13 | "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" |
@@ -16,6 +16,143 @@ msgstr "" | |||
16 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
17 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
18 | 18 | ||
19 | #: src/abd/gnunet-abd.c:394 src/namestore/gnunet-namestore.c:994 | ||
20 | #, c-format | ||
21 | msgid "Ego `%s' not known to identity service\n" | ||
22 | msgstr "" | ||
23 | |||
24 | #: src/abd/gnunet-abd.c:410 src/abd/gnunet-abd.c:875 | ||
25 | #, fuzzy, c-format | ||
26 | msgid "Issuer public key `%s' is not well-formed\n" | ||
27 | msgstr "“%s”的参数无效。\n" | ||
28 | |||
29 | #: src/abd/gnunet-abd.c:549 src/abd/gnunet-service-abd.c:1723 | ||
30 | #: src/namestore/gnunet-namestore.c:1019 | ||
31 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
32 | #, fuzzy, c-format | ||
33 | msgid "Failed to connect to namestore\n" | ||
34 | msgstr "初始化“%s”服务失败。\n" | ||
35 | |||
36 | #: src/abd/gnunet-abd.c:814 src/abd/gnunet-abd.c:865 | ||
37 | #, fuzzy, c-format | ||
38 | msgid "Issuer public key not well-formed\n" | ||
39 | msgstr "“%s”的参数无效。\n" | ||
40 | |||
41 | #: src/abd/gnunet-abd.c:823 src/abd/gnunet-abd.c:884 | ||
42 | #, fuzzy, c-format | ||
43 | msgid "Failed to connect to ABD\n" | ||
44 | msgstr "初始化“%s”服务失败。\n" | ||
45 | |||
46 | #: src/abd/gnunet-abd.c:829 | ||
47 | #, c-format | ||
48 | msgid "You must provide issuer the attribute\n" | ||
49 | msgstr "" | ||
50 | |||
51 | #: src/abd/gnunet-abd.c:836 | ||
52 | #, c-format | ||
53 | msgid "ego required\n" | ||
54 | msgstr "" | ||
55 | |||
56 | #: src/abd/gnunet-abd.c:846 | ||
57 | #, c-format | ||
58 | msgid "Subject public key needed\n" | ||
59 | msgstr "" | ||
60 | |||
61 | #: src/abd/gnunet-abd.c:855 | ||
62 | #, fuzzy, c-format | ||
63 | msgid "Subject public key `%s' is not well-formed\n" | ||
64 | msgstr "“%s”的参数无效。\n" | ||
65 | |||
66 | #: src/abd/gnunet-abd.c:890 | ||
67 | #, c-format | ||
68 | msgid "You must provide issuer and subject attributes\n" | ||
69 | msgstr "" | ||
70 | |||
71 | #: src/abd/gnunet-abd.c:946 | ||
72 | #, c-format | ||
73 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
74 | msgstr "" | ||
75 | |||
76 | #: src/abd/gnunet-abd.c:967 | ||
77 | msgid "verify credential against attribute" | ||
78 | msgstr "" | ||
79 | |||
80 | #: src/abd/gnunet-abd.c:974 | ||
81 | msgid "" | ||
82 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
83 | "side storage: subject and its attributes" | ||
84 | msgstr "" | ||
85 | |||
86 | #: src/abd/gnunet-abd.c:981 | ||
87 | msgid "The private, signed delegate presented by the subject" | ||
88 | msgstr "" | ||
89 | |||
90 | #: src/abd/gnunet-abd.c:988 | ||
91 | msgid "The public key of the authority to verify the credential against" | ||
92 | msgstr "" | ||
93 | |||
94 | #: src/abd/gnunet-abd.c:993 | ||
95 | #, fuzzy | ||
96 | msgid "The ego/zone name to use" | ||
97 | msgstr "消息尺寸" | ||
98 | |||
99 | #: src/abd/gnunet-abd.c:999 | ||
100 | msgid "The issuer attribute to verify against or to issue" | ||
101 | msgstr "" | ||
102 | |||
103 | #: src/abd/gnunet-abd.c:1005 | ||
104 | msgid "" | ||
105 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
106 | msgstr "" | ||
107 | |||
108 | #: src/abd/gnunet-abd.c:1010 | ||
109 | msgid "collect credentials" | ||
110 | msgstr "" | ||
111 | |||
112 | #: src/abd/gnunet-abd.c:1015 | ||
113 | msgid "Create and issue a credential issuer side." | ||
114 | msgstr "" | ||
115 | |||
116 | #: src/abd/gnunet-abd.c:1020 | ||
117 | msgid "Issue a credential subject side." | ||
118 | msgstr "" | ||
119 | |||
120 | #: src/abd/gnunet-abd.c:1025 | ||
121 | msgid "Create, sign and return a credential subject side." | ||
122 | msgstr "" | ||
123 | |||
124 | #: src/abd/gnunet-abd.c:1032 | ||
125 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
126 | msgstr "" | ||
127 | |||
128 | #: src/abd/gnunet-abd.c:1036 | ||
129 | msgid "Create private record entry." | ||
130 | msgstr "" | ||
131 | |||
132 | #: src/abd/gnunet-abd.c:1042 src/abd/gnunet-abd.c:1048 | ||
133 | msgid "Indicates that the collect/verify process is done via forward search." | ||
134 | msgstr "" | ||
135 | |||
136 | #: src/abd/gnunet-abd.c:1061 | ||
137 | #, fuzzy | ||
138 | msgid "GNUnet abd resolver tool" | ||
139 | msgstr "GNUnet 错误日志" | ||
140 | |||
141 | #: src/abd/gnunet-service-abd.c:1718 src/gns/gnunet-gns.c:185 | ||
142 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
143 | #, fuzzy, c-format | ||
144 | msgid "Failed to connect to GNS\n" | ||
145 | msgstr "初始化“%s”服务失败。\n" | ||
146 | |||
147 | #: src/abd/plugin_gnsrecord_abd.c:182 | ||
148 | #, fuzzy, c-format | ||
149 | msgid "Unable to parse ATTR record string `%s'\n" | ||
150 | msgstr "解析配置文件“%s”失败\n" | ||
151 | |||
152 | #: src/abd/plugin_rest_abd.c:1128 src/abd/plugin_rest_credential.c:1128 | ||
153 | msgid "GNS REST API initialized\n" | ||
154 | msgstr "" | ||
155 | |||
19 | #: src/arm/gnunet-arm.c:156 | 156 | #: src/arm/gnunet-arm.c:156 |
20 | #, fuzzy, c-format | 157 | #, fuzzy, c-format |
21 | msgid "Failed to remove configuration file %s\n" | 158 | msgid "Failed to remove configuration file %s\n" |
@@ -1454,148 +1591,6 @@ msgstr "" | |||
1454 | msgid "# updates to my type map" | 1591 | msgid "# updates to my type map" |
1455 | msgstr "" | 1592 | msgstr "" |
1456 | 1593 | ||
1457 | #: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994 | ||
1458 | #, c-format | ||
1459 | msgid "Ego `%s' not known to identity service\n" | ||
1460 | msgstr "" | ||
1461 | |||
1462 | #: src/credential/gnunet-credential.c:397 | ||
1463 | #: src/credential/gnunet-credential.c:859 | ||
1464 | #, fuzzy, c-format | ||
1465 | msgid "Issuer public key `%s' is not well-formed\n" | ||
1466 | msgstr "“%s”的参数无效。\n" | ||
1467 | |||
1468 | #: src/credential/gnunet-credential.c:532 | ||
1469 | #: src/credential/gnunet-service-credential.c:1728 | ||
1470 | #: src/namestore/gnunet-namestore.c:1019 | ||
1471 | #: src/namestore/gnunet-namestore-fcfsd.c:1138 | ||
1472 | #, fuzzy, c-format | ||
1473 | msgid "Failed to connect to namestore\n" | ||
1474 | msgstr "初始化“%s”服务失败。\n" | ||
1475 | |||
1476 | #: src/credential/gnunet-credential.c:798 | ||
1477 | #: src/credential/gnunet-credential.c:849 | ||
1478 | #, fuzzy, c-format | ||
1479 | msgid "Issuer public key not well-formed\n" | ||
1480 | msgstr "“%s”的参数无效。\n" | ||
1481 | |||
1482 | #: src/credential/gnunet-credential.c:807 | ||
1483 | #: src/credential/gnunet-credential.c:868 | ||
1484 | #, fuzzy, c-format | ||
1485 | msgid "Failed to connect to CREDENTIAL\n" | ||
1486 | msgstr "初始化“%s”服务失败。\n" | ||
1487 | |||
1488 | #: src/credential/gnunet-credential.c:813 | ||
1489 | #, c-format | ||
1490 | msgid "You must provide issuer the attribute\n" | ||
1491 | msgstr "" | ||
1492 | |||
1493 | #: src/credential/gnunet-credential.c:820 | ||
1494 | #, c-format | ||
1495 | msgid "ego required\n" | ||
1496 | msgstr "" | ||
1497 | |||
1498 | #: src/credential/gnunet-credential.c:830 | ||
1499 | #, c-format | ||
1500 | msgid "Subject public key needed\n" | ||
1501 | msgstr "" | ||
1502 | |||
1503 | #: src/credential/gnunet-credential.c:839 | ||
1504 | #, fuzzy, c-format | ||
1505 | msgid "Subject public key `%s' is not well-formed\n" | ||
1506 | msgstr "“%s”的参数无效。\n" | ||
1507 | |||
1508 | #: src/credential/gnunet-credential.c:874 | ||
1509 | #, c-format | ||
1510 | msgid "You must provide issuer and subject attributes\n" | ||
1511 | msgstr "" | ||
1512 | |||
1513 | #: src/credential/gnunet-credential.c:930 | ||
1514 | #, c-format | ||
1515 | msgid "Please specify name to lookup, subject key and issuer key!\n" | ||
1516 | msgstr "" | ||
1517 | |||
1518 | #: src/credential/gnunet-credential.c:951 | ||
1519 | msgid "verify credential against attribute" | ||
1520 | msgstr "" | ||
1521 | |||
1522 | #: src/credential/gnunet-credential.c:958 | ||
1523 | msgid "" | ||
1524 | "The public key of the subject to lookup thecredential for, or for issuer " | ||
1525 | "side storage: subject and its attributes" | ||
1526 | msgstr "" | ||
1527 | |||
1528 | #: src/credential/gnunet-credential.c:965 | ||
1529 | msgid "The private, signed delegate presented by the subject" | ||
1530 | msgstr "" | ||
1531 | |||
1532 | #: src/credential/gnunet-credential.c:972 | ||
1533 | msgid "The public key of the authority to verify the credential against" | ||
1534 | msgstr "" | ||
1535 | |||
1536 | #: src/credential/gnunet-credential.c:977 | ||
1537 | #, fuzzy | ||
1538 | msgid "The ego/zone name to use" | ||
1539 | msgstr "消息尺寸" | ||
1540 | |||
1541 | #: src/credential/gnunet-credential.c:983 | ||
1542 | msgid "The issuer attribute to verify against or to issue" | ||
1543 | msgstr "" | ||
1544 | |||
1545 | #: src/credential/gnunet-credential.c:989 | ||
1546 | msgid "" | ||
1547 | "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" | ||
1548 | msgstr "" | ||
1549 | |||
1550 | #: src/credential/gnunet-credential.c:994 | ||
1551 | msgid "collect credentials" | ||
1552 | msgstr "" | ||
1553 | |||
1554 | #: src/credential/gnunet-credential.c:999 | ||
1555 | msgid "Create and issue a credential issuer side." | ||
1556 | msgstr "" | ||
1557 | |||
1558 | #: src/credential/gnunet-credential.c:1004 | ||
1559 | msgid "Issue a credential subject side." | ||
1560 | msgstr "" | ||
1561 | |||
1562 | #: src/credential/gnunet-credential.c:1009 | ||
1563 | msgid "Create, sign and return a credential subject side." | ||
1564 | msgstr "" | ||
1565 | |||
1566 | #: src/credential/gnunet-credential.c:1016 | ||
1567 | msgid "Import signed credentials that should be issued to a zone/ego" | ||
1568 | msgstr "" | ||
1569 | |||
1570 | #: src/credential/gnunet-credential.c:1020 | ||
1571 | msgid "Create private record entry." | ||
1572 | msgstr "" | ||
1573 | |||
1574 | #: src/credential/gnunet-credential.c:1026 | ||
1575 | #: src/credential/gnunet-credential.c:1032 | ||
1576 | msgid "Indicates that the collect/verify process is done via forward search." | ||
1577 | msgstr "" | ||
1578 | |||
1579 | #: src/credential/gnunet-credential.c:1045 | ||
1580 | #, fuzzy | ||
1581 | msgid "GNUnet credential resolver tool" | ||
1582 | msgstr "GNUnet 错误日志" | ||
1583 | |||
1584 | #: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185 | ||
1585 | #: src/gns/gnunet-gns-helper-service-w32.c:727 | ||
1586 | #, fuzzy, c-format | ||
1587 | msgid "Failed to connect to GNS\n" | ||
1588 | msgstr "初始化“%s”服务失败。\n" | ||
1589 | |||
1590 | #: src/credential/plugin_gnsrecord_credential.c:182 | ||
1591 | #, fuzzy, c-format | ||
1592 | msgid "Unable to parse ATTR record string `%s'\n" | ||
1593 | msgstr "解析配置文件“%s”失败\n" | ||
1594 | |||
1595 | #: src/credential/plugin_rest_credential.c:1128 | ||
1596 | msgid "GNS REST API initialized\n" | ||
1597 | msgstr "" | ||
1598 | |||
1599 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 | 1594 | #: src/datacache/datacache.c:119 src/datacache/datacache.c:311 |
1600 | #: src/datastore/gnunet-service-datastore.c:757 | 1595 | #: src/datastore/gnunet-service-datastore.c:757 |
1601 | msgid "# bytes stored" | 1596 | msgid "# bytes stored" |
@@ -8943,6 +8938,14 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" | |||
8943 | msgstr "" | 8938 | msgstr "" |
8944 | 8939 | ||
8945 | #, fuzzy | 8940 | #, fuzzy |
8941 | #~ msgid "Failed to connect to CREDENTIAL\n" | ||
8942 | #~ msgstr "初始化“%s”服务失败。\n" | ||
8943 | |||
8944 | #, fuzzy | ||
8945 | #~ msgid "GNUnet credential resolver tool" | ||
8946 | #~ msgstr "GNUnet 错误日志" | ||
8947 | |||
8948 | #, fuzzy | ||
8946 | #~ msgid "Unable to parse CRED record string `%s'\n" | 8949 | #~ msgid "Unable to parse CRED record string `%s'\n" |
8947 | #~ msgstr "解析配置文件“%s”失败\n" | 8950 | #~ msgstr "解析配置文件“%s”失败\n" |
8948 | 8951 | ||
diff --git a/src/Makefile.am b/src/Makefile.am index 217aea54f..51bf2d63d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -12,7 +12,9 @@ endif | |||
12 | if HAVE_EXPERIMENTAL | 12 | if HAVE_EXPERIMENTAL |
13 | EXP_DIR = \ | 13 | EXP_DIR = \ |
14 | rps \ | 14 | rps \ |
15 | credential | 15 | abd \ |
16 | reclaim-attribute \ | ||
17 | reclaim | ||
16 | if HAVE_ABE | 18 | if HAVE_ABE |
17 | EXP_DIR += \ | 19 | EXP_DIR += \ |
18 | abe | 20 | abe |
@@ -23,7 +25,6 @@ if HAVE_JSON | |||
23 | endif | 25 | endif |
24 | endif | 26 | endif |
25 | 27 | ||
26 | if HAVE_MHD | ||
27 | if HAVE_JSON | 28 | if HAVE_JSON |
28 | JSON_DIR = json | 29 | JSON_DIR = json |
29 | if HAVE_LIBGNURL | 30 | if HAVE_LIBGNURL |
@@ -34,6 +35,13 @@ if HAVE_LIBCURL | |||
34 | endif | 35 | endif |
35 | endif | 36 | endif |
36 | endif | 37 | endif |
38 | |||
39 | if BUILD_PULSE_HELPERS | ||
40 | CONVERSATION_DIR = conversation | ||
41 | else | ||
42 | if BUILD_GST_HELPERS | ||
43 | CONVERSATION_DIR = conversation | ||
44 | endif | ||
37 | endif | 45 | endif |
38 | 46 | ||
39 | if HAVE_SQLITE | 47 | if HAVE_SQLITE |
@@ -51,7 +59,6 @@ endif | |||
51 | if HAVE_MHD | 59 | if HAVE_MHD |
52 | if HAVE_JSON | 60 | if HAVE_JSON |
53 | REST_DIR = rest | 61 | REST_DIR = rest |
54 | RECLAIM_DIR = reclaim-attribute reclaim | ||
55 | endif | 62 | endif |
56 | endif | 63 | endif |
57 | 64 | ||
@@ -109,12 +116,11 @@ SUBDIRS = \ | |||
109 | vpn \ | 116 | vpn \ |
110 | gns \ | 117 | gns \ |
111 | zonemaster \ | 118 | zonemaster \ |
112 | conversation \ | 119 | $(CONVERSATION_DIR) \ |
113 | fs \ | 120 | fs \ |
114 | exit \ | 121 | exit \ |
115 | pt \ | 122 | pt \ |
116 | secretsharing \ | 123 | secretsharing \ |
117 | $(RECLAIM_DIR) \ | ||
118 | $(EXP_DIR) \ | 124 | $(EXP_DIR) \ |
119 | integration-tests | 125 | integration-tests |
120 | 126 | ||
diff --git a/src/credential/Makefile.am b/src/abd/Makefile.am index e72cf4f79..321fb0350 100644 --- a/src/credential/Makefile.am +++ b/src/abd/Makefile.am | |||
@@ -2,8 +2,8 @@ | |||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | 2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include |
3 | 3 | ||
4 | EXTRA_DIST = \ | 4 | EXTRA_DIST = \ |
5 | test_credential_defaults.conf \ | 5 | test_abd_defaults.conf \ |
6 | test_credential_lookup.conf | 6 | test_abd_lookup.conf |
7 | 7 | ||
8 | 8 | ||
9 | if USE_COVERAGE | 9 | if USE_COVERAGE |
@@ -17,28 +17,28 @@ libexecdir= $(pkglibdir)/libexec/ | |||
17 | plugindir = $(libdir)/gnunet | 17 | plugindir = $(libdir)/gnunet |
18 | 18 | ||
19 | pkgcfg_DATA = \ | 19 | pkgcfg_DATA = \ |
20 | credential.conf | 20 | abd.conf |
21 | 21 | ||
22 | 22 | ||
23 | # /usr/lib - compiles a layer which can be used to be communicagte with the service | 23 | # /usr/lib - compiles a layer which can be used to be communicagte with the service |
24 | lib_LTLIBRARIES = \ | 24 | lib_LTLIBRARIES = \ |
25 | libgnunetcredential.la | 25 | libgnunetabd.la |
26 | 26 | ||
27 | # /usr/lib/gnunet/libexec - Business logic . Separate process | 27 | # /usr/lib/gnunet/libexec - Business logic . Separate process |
28 | libexec_PROGRAMS = \ | 28 | libexec_PROGRAMS = \ |
29 | gnunet-service-credential | 29 | gnunet-service-abd |
30 | 30 | ||
31 | bin_PROGRAMS = \ | 31 | bin_PROGRAMS = \ |
32 | gnunet-credential | 32 | gnunet-abd |
33 | 33 | ||
34 | plugin_LTLIBRARIES = \ | 34 | plugin_LTLIBRARIES = \ |
35 | libgnunet_plugin_gnsrecord_credential.la | 35 | libgnunet_plugin_gnsrecord_abd.la |
36 | 36 | ||
37 | 37 | ||
38 | gnunet_credential_SOURCES = \ | 38 | gnunet_abd_SOURCES = \ |
39 | gnunet-credential.c | 39 | gnunet-abd.c |
40 | gnunet_credential_LDADD = \ | 40 | gnunet_abd_LDADD = \ |
41 | libgnunetcredential.la \ | 41 | libgnunetabd.la \ |
42 | $(top_builddir)/src/util/libgnunetutil.la \ | 42 | $(top_builddir)/src/util/libgnunetutil.la \ |
43 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 43 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
44 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 44 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
@@ -46,21 +46,21 @@ gnunet_credential_LDADD = \ | |||
46 | $(GN_LIBINTL) | 46 | $(GN_LIBINTL) |
47 | 47 | ||
48 | 48 | ||
49 | libgnunet_plugin_gnsrecord_credential_la_SOURCES = \ | 49 | libgnunet_plugin_gnsrecord_abd_la_SOURCES = \ |
50 | plugin_gnsrecord_credential.c | 50 | plugin_gnsrecord_abd.c |
51 | libgnunet_plugin_gnsrecord_credential_la_LIBADD = \ | 51 | libgnunet_plugin_gnsrecord_abd_la_LIBADD = \ |
52 | libgnunetcredential.la \ | 52 | libgnunetabd.la \ |
53 | $(top_builddir)/src/util/libgnunetutil.la \ | 53 | $(top_builddir)/src/util/libgnunetutil.la \ |
54 | $(LTLIBINTL) | 54 | $(LTLIBINTL) |
55 | libgnunet_plugin_gnsrecord_credential_la_LDFLAGS = \ | 55 | libgnunet_plugin_gnsrecord_abd_la_LDFLAGS = \ |
56 | $(GN_PLUGIN_LDFLAGS) | 56 | $(GN_PLUGIN_LDFLAGS) |
57 | 57 | ||
58 | 58 | ||
59 | 59 | ||
60 | gnunet_service_credential_SOURCES = \ | 60 | gnunet_service_abd_SOURCES = \ |
61 | gnunet-service-credential.c | 61 | gnunet-service-abd.c |
62 | gnunet_service_credential_LDADD = \ | 62 | gnunet_service_abd_LDADD = \ |
63 | libgnunetcredential.la \ | 63 | libgnunetabd.la \ |
64 | $(top_builddir)/src/util/libgnunetutil.la \ | 64 | $(top_builddir)/src/util/libgnunetutil.la \ |
65 | $(top_builddir)/src/gns/libgnunetgns.la \ | 65 | $(top_builddir)/src/gns/libgnunetgns.la \ |
66 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 66 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
@@ -68,24 +68,24 @@ gnunet_service_credential_LDADD = \ | |||
68 | $(GN_LIBINTL) | 68 | $(GN_LIBINTL) |
69 | 69 | ||
70 | 70 | ||
71 | libgnunetcredential_la_SOURCES = \ | 71 | libgnunetabd_la_SOURCES = \ |
72 | credential_api.c credential.h\ | 72 | abd_api.c abd.h\ |
73 | credential_serialization.c \ | 73 | abd_serialization.c \ |
74 | credential_serialization.h \ | 74 | abd_serialization.h \ |
75 | delegate_misc.c \ | 75 | delegate_misc.c \ |
76 | delegate_misc.h | 76 | delegate_misc.h |
77 | libgnunetcredential_la_LIBADD = \ | 77 | libgnunetabd_la_LIBADD = \ |
78 | $(top_builddir)/src/util/libgnunetutil.la $(XLIB) | 78 | $(top_builddir)/src/util/libgnunetutil.la $(XLIB) |
79 | libgnunetcredential_la_LDFLAGS = \ | 79 | libgnunetabd_la_LDFLAGS = \ |
80 | $(GN_LIB_LDFLAGS) | 80 | $(GN_LIB_LDFLAGS) |
81 | 81 | ||
82 | 82 | ||
83 | 83 | ||
84 | check_SCRIPTS = \ | 84 | check_SCRIPTS = \ |
85 | test_credential_issue.sh \ | 85 | test_abd_issue.sh \ |
86 | test_credential_verify_simple.sh \ | 86 | test_abd_verify_simple.sh \ |
87 | test_credential_verify.sh \ | 87 | test_abd_verify.sh \ |
88 | test_credential_verify_and.sh | 88 | test_abd_verify_and.sh |
89 | 89 | ||
90 | if ENABLE_TEST_RUN | 90 | if ENABLE_TEST_RUN |
91 | if HAVE_SQLITE | 91 | if HAVE_SQLITE |
@@ -94,17 +94,16 @@ if HAVE_SQLITE | |||
94 | endif | 94 | endif |
95 | endif | 95 | endif |
96 | 96 | ||
97 | #libgnunet_plugin_rest_credential_la_SOURCES = \ | 97 | #libgnunet_plugin_rest_abd_la_SOURCES = \ |
98 | # plugin_rest_credential.c | 98 | # plugin_rest_abd.c |
99 | #libgnunet_plugin_rest_credential_la_LIBADD = \ | 99 | #libgnunet_plugin_rest_abd_la_LIBADD = \ |
100 | # $(top_builddir)/src/credential/libgnunetcredential.la \ | 100 | # $(top_builddir)/src/abd/libgnunetabd.la \ |
101 | # $(top_builddir)/src/rest/libgnunetrest.la \ | 101 | # $(top_builddir)/src/rest/libgnunetrest.la \ |
102 | # $(top_builddir)/src/identity/libgnunetidentity.la \ | 102 | # $(top_builddir)/src/identity/libgnunetidentity.la \ |
103 | # $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 103 | # $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
104 | # $(LTLIBINTL) -ljansson $(MHD_LIBS) | 104 | # $(LTLIBINTL) -ljansson -lmicrohttpd |
105 | #libgnunet_plugin_rest_credential_la_LDFLAGS = \ | 105 | #libgnunet_plugin_rest_abd_la_LDFLAGS = \ |
106 | # $(GN_PLUGIN_LDFLAGS) | 106 | # $(GN_PLUGIN_LDFLAGS) |
107 | #libgnunet_plugin_rest_credential_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
108 | 107 | ||
109 | 108 | ||
110 | 109 | ||
diff --git a/src/abd/abd.conf.in b/src/abd/abd.conf.in new file mode 100644 index 000000000..7baf95fc8 --- /dev/null +++ b/src/abd/abd.conf.in | |||
@@ -0,0 +1,5 @@ | |||
1 | [abd] | ||
2 | BINARY = gnunet-service-abd | ||
3 | UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-abd.sock | ||
4 | RUN_PER_USER = YES | ||
5 | OPTIONS = -L DEBUG | ||
diff --git a/src/credential/credential.h b/src/abd/abd.h index 1dd476814..854814832 100644 --- a/src/credential/credential.h +++ b/src/abd/abd.h | |||
@@ -11,21 +11,21 @@ | |||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Affero General Public License for more details. | 13 | Affero General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Affero General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | 17 | ||
18 | SPDX-License-Identifier: AGPL3.0-or-later | 18 | SPDX-License-Identifier: AGPL3.0-or-later |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file credential/credential.h | 21 | * @file abd/abd.h |
22 | * @brief IPC messages between CREDENTIAL API and CREDENTIAL service | 22 | * @brief IPC messages between ABD API and ABD service |
23 | * @author Martin Schanzenbach | 23 | * @author Martin Schanzenbach |
24 | */ | 24 | */ |
25 | #ifndef CREDENTIAL_H | 25 | #ifndef ABD_H |
26 | #define CREDENTIAL_H | 26 | #define ABD_H |
27 | 27 | ||
28 | #include "gnunet_credential_service.h" | 28 | #include "gnunet_abd_service.h" |
29 | 29 | ||
30 | GNUNET_NETWORK_STRUCT_BEGIN | 30 | GNUNET_NETWORK_STRUCT_BEGIN |
31 | 31 | ||
@@ -35,7 +35,7 @@ GNUNET_NETWORK_STRUCT_BEGIN | |||
35 | struct CollectMessage | 35 | struct CollectMessage |
36 | { | 36 | { |
37 | /** | 37 | /** |
38 | * Header of type #GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY | 38 | * Header of type #GNUNET_MESSAGE_TYPE_ABD_VERIFY |
39 | */ | 39 | */ |
40 | struct GNUNET_MessageHeader header; | 40 | struct GNUNET_MessageHeader header; |
41 | 41 | ||
@@ -74,7 +74,7 @@ struct CollectMessage | |||
74 | struct VerifyMessage | 74 | struct VerifyMessage |
75 | { | 75 | { |
76 | /** | 76 | /** |
77 | * Header of type #GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY | 77 | * Header of type #GNUNET_MESSAGE_TYPE_ABD_VERIFY |
78 | */ | 78 | */ |
79 | struct GNUNET_MessageHeader header; | 79 | struct GNUNET_MessageHeader header; |
80 | 80 | ||
@@ -113,12 +113,12 @@ struct VerifyMessage | |||
113 | 113 | ||
114 | 114 | ||
115 | /** | 115 | /** |
116 | * Message from CREDENTIAL service to client: new results. | 116 | * Message from ABD service to client: new results. |
117 | */ | 117 | */ |
118 | struct DelegationChainResultMessage | 118 | struct DelegationChainResultMessage |
119 | { | 119 | { |
120 | /** | 120 | /** |
121 | * Header of type #GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY_RESULT | 121 | * Header of type #GNUNET_MESSAGE_TYPE_ABD_VERIFY_RESULT |
122 | */ | 122 | */ |
123 | struct GNUNET_MessageHeader header; | 123 | struct GNUNET_MessageHeader header; |
124 | 124 | ||
@@ -142,16 +142,16 @@ struct DelegationChainResultMessage | |||
142 | */ | 142 | */ |
143 | uint32_t c_count GNUNET_PACKED; | 143 | uint32_t c_count GNUNET_PACKED; |
144 | 144 | ||
145 | /* followed by ad_count GNUNET_CREDENTIAL_RecordData structs*/ | 145 | /* followed by ad_count GNUNET_ABD_RecordData structs*/ |
146 | }; | 146 | }; |
147 | 147 | ||
148 | /** | 148 | /** |
149 | * Message from CREDENTIAL service to client: new results. | 149 | * Message from ABD service to client: new results. |
150 | */ | 150 | */ |
151 | struct DelegationChainIntermediateMessage | 151 | struct DelegationChainIntermediateMessage |
152 | { | 152 | { |
153 | /** | 153 | /** |
154 | * Header of type #GNUNET_MESSAGE_TYPE_CREDENTIAL_INTERMEDIATE_RESULT | 154 | * Header of type #GNUNET_MESSAGE_TYPE_ABD_INTERMEDIATE_RESULT |
155 | */ | 155 | */ |
156 | struct GNUNET_MessageHeader header; | 156 | struct GNUNET_MessageHeader header; |
157 | 157 | ||
@@ -205,6 +205,7 @@ struct ChainEntry | |||
205 | 205 | ||
206 | struct CredentialEntry | 206 | struct CredentialEntry |
207 | { | 207 | { |
208 | |||
208 | /** | 209 | /** |
209 | * The signature for this credential by the issuer | 210 | * The signature for this credential by the issuer |
210 | */ | 211 | */ |
diff --git a/src/credential/credential_api.c b/src/abd/abd_api.c index 7acce7d9e..cdc52df91 100644 --- a/src/credential/credential_api.c +++ b/src/abd/abd_api.c | |||
@@ -18,8 +18,8 @@ | |||
18 | SPDX-License-Identifier: AGPL3.0-or-later | 18 | SPDX-License-Identifier: AGPL3.0-or-later |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file credential/credential_api.c | 21 | * @file abd/abd_api.c |
22 | * @brief library to access the CREDENTIAL service | 22 | * @brief library to access the ABD service |
23 | * @author Martin Schanzenbach | 23 | * @author Martin Schanzenbach |
24 | */ | 24 | */ |
25 | #include "platform.h" | 25 | #include "platform.h" |
@@ -29,39 +29,39 @@ | |||
29 | #include "gnunet_hello_lib.h" | 29 | #include "gnunet_hello_lib.h" |
30 | #include "gnunet_protocols.h" | 30 | #include "gnunet_protocols.h" |
31 | #include "gnunet_signatures.h" | 31 | #include "gnunet_signatures.h" |
32 | #include "credential.h" | 32 | #include "abd.h" |
33 | #include "credential_serialization.h" | 33 | #include "abd_serialization.h" |
34 | #include "gnunet_credential_service.h" | 34 | #include "gnunet_abd_service.h" |
35 | #include "gnunet_identity_service.h" | 35 | #include "gnunet_identity_service.h" |
36 | 36 | ||
37 | 37 | ||
38 | #define LOG(kind, ...) GNUNET_log_from (kind, "credential-api", __VA_ARGS__) | 38 | #define LOG(kind, ...) GNUNET_log_from (kind, "abd-api", __VA_ARGS__) |
39 | 39 | ||
40 | /** | 40 | /** |
41 | * Handle to a verify request | 41 | * Handle to a verify request |
42 | */ | 42 | */ |
43 | struct GNUNET_CREDENTIAL_Request | 43 | struct GNUNET_ABD_Request |
44 | { | 44 | { |
45 | 45 | ||
46 | /** | 46 | /** |
47 | * DLL | 47 | * DLL |
48 | */ | 48 | */ |
49 | struct GNUNET_CREDENTIAL_Request *next; | 49 | struct GNUNET_ABD_Request *next; |
50 | 50 | ||
51 | /** | 51 | /** |
52 | * DLL | 52 | * DLL |
53 | */ | 53 | */ |
54 | struct GNUNET_CREDENTIAL_Request *prev; | 54 | struct GNUNET_ABD_Request *prev; |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * handle to credential service | 57 | * handle to abd service |
58 | */ | 58 | */ |
59 | struct GNUNET_CREDENTIAL_Handle *credential_handle; | 59 | struct GNUNET_ABD_Handle *abd_handle; |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * processor to call on verify result | 62 | * processor to call on verify result |
63 | */ | 63 | */ |
64 | GNUNET_CREDENTIAL_CredentialResultProcessor verify_proc; | 64 | GNUNET_ABD_CredentialResultProcessor verify_proc; |
65 | 65 | ||
66 | /** | 66 | /** |
67 | * @e verify_proc closure | 67 | * @e verify_proc closure |
@@ -71,7 +71,7 @@ struct GNUNET_CREDENTIAL_Request | |||
71 | /** | 71 | /** |
72 | * processor to call on intermediate result | 72 | * processor to call on intermediate result |
73 | */ | 73 | */ |
74 | GNUNET_CREDENTIAL_IntermediateResultProcessor int_proc; | 74 | GNUNET_ABD_IntermediateResultProcessor int_proc; |
75 | 75 | ||
76 | /** | 76 | /** |
77 | * @e verify_proc2 closure | 77 | * @e verify_proc2 closure |
@@ -91,9 +91,9 @@ struct GNUNET_CREDENTIAL_Request | |||
91 | 91 | ||
92 | 92 | ||
93 | /** | 93 | /** |
94 | * Connection to the CREDENTIAL service. | 94 | * Connection to the ABD service. |
95 | */ | 95 | */ |
96 | struct GNUNET_CREDENTIAL_Handle | 96 | struct GNUNET_ABD_Handle |
97 | { | 97 | { |
98 | 98 | ||
99 | /** | 99 | /** |
@@ -109,12 +109,12 @@ struct GNUNET_CREDENTIAL_Handle | |||
109 | /** | 109 | /** |
110 | * Head of linked list of active verify requests. | 110 | * Head of linked list of active verify requests. |
111 | */ | 111 | */ |
112 | struct GNUNET_CREDENTIAL_Request *request_head; | 112 | struct GNUNET_ABD_Request *request_head; |
113 | 113 | ||
114 | /** | 114 | /** |
115 | * Tail of linked list of active verify requests. | 115 | * Tail of linked list of active verify requests. |
116 | */ | 116 | */ |
117 | struct GNUNET_CREDENTIAL_Request *request_tail; | 117 | struct GNUNET_ABD_Request *request_tail; |
118 | 118 | ||
119 | /** | 119 | /** |
120 | * Reconnect task | 120 | * Reconnect task |
@@ -134,23 +134,23 @@ struct GNUNET_CREDENTIAL_Handle | |||
134 | 134 | ||
135 | 135 | ||
136 | /** | 136 | /** |
137 | * Reconnect to CREDENTIAL service. | 137 | * Reconnect to ABD service. |
138 | * | 138 | * |
139 | * @param handle the handle to the CREDENTIAL service | 139 | * @param handle the handle to the ABD service |
140 | */ | 140 | */ |
141 | static void | 141 | static void |
142 | reconnect (struct GNUNET_CREDENTIAL_Handle *handle); | 142 | reconnect (struct GNUNET_ABD_Handle *handle); |
143 | 143 | ||
144 | 144 | ||
145 | /** | 145 | /** |
146 | * Reconnect to CREDENTIAL | 146 | * Reconnect to ABD |
147 | * | 147 | * |
148 | * @param cls the handle | 148 | * @param cls the handle |
149 | */ | 149 | */ |
150 | static void | 150 | static void |
151 | reconnect_task (void *cls) | 151 | reconnect_task (void *cls) |
152 | { | 152 | { |
153 | struct GNUNET_CREDENTIAL_Handle *handle = cls; | 153 | struct GNUNET_ABD_Handle *handle = cls; |
154 | 154 | ||
155 | handle->reconnect_task = NULL; | 155 | handle->reconnect_task = NULL; |
156 | reconnect (handle); | 156 | reconnect (handle); |
@@ -163,7 +163,7 @@ reconnect_task (void *cls) | |||
163 | * @param handle our handle | 163 | * @param handle our handle |
164 | */ | 164 | */ |
165 | static void | 165 | static void |
166 | force_reconnect (struct GNUNET_CREDENTIAL_Handle *handle) | 166 | force_reconnect (struct GNUNET_ABD_Handle *handle) |
167 | { | 167 | { |
168 | GNUNET_MQ_destroy (handle->mq); | 168 | GNUNET_MQ_destroy (handle->mq); |
169 | handle->mq = NULL; | 169 | handle->mq = NULL; |
@@ -181,21 +181,21 @@ force_reconnect (struct GNUNET_CREDENTIAL_Handle *handle) | |||
181 | * the same closure specified at the creation of the message queue. | 181 | * the same closure specified at the creation of the message queue. |
182 | * Not every message queue implementation supports an error handler. | 182 | * Not every message queue implementation supports an error handler. |
183 | * | 183 | * |
184 | * @param cls closure with the `struct GNUNET_CREDENTIAL_Handle *` | 184 | * @param cls closure with the `struct GNUNET_ABD_Handle *` |
185 | * @param error error code | 185 | * @param error error code |
186 | */ | 186 | */ |
187 | static void | 187 | static void |
188 | mq_error_handler (void *cls, enum GNUNET_MQ_Error error) | 188 | mq_error_handler (void *cls, enum GNUNET_MQ_Error error) |
189 | { | 189 | { |
190 | struct GNUNET_CREDENTIAL_Handle *handle = cls; | 190 | struct GNUNET_ABD_Handle *handle = cls; |
191 | 191 | ||
192 | force_reconnect (handle); | 192 | force_reconnect (handle); |
193 | } | 193 | } |
194 | 194 | ||
195 | /** | 195 | /** |
196 | * Check validity of message received from the CREDENTIAL service | 196 | * Check validity of message received from the ABD service |
197 | * | 197 | * |
198 | * @param cls the `struct GNUNET_CREDENTIAL_Handle *` | 198 | * @param cls the `struct GNUNET_ABD_Handle *` |
199 | * @param vr_msg the incoming message | 199 | * @param vr_msg the incoming message |
200 | */ | 200 | */ |
201 | static int | 201 | static int |
@@ -207,27 +207,27 @@ check_result (void *cls, const struct DelegationChainResultMessage *vr_msg) | |||
207 | 207 | ||
208 | 208 | ||
209 | /** | 209 | /** |
210 | * Handler for messages received from the CREDENTIAL service | 210 | * Handler for messages received from the ABD service |
211 | * | 211 | * |
212 | * @param cls the `struct GNUNET_CREDENTIAL_Handle *` | 212 | * @param cls the `struct GNUNET_ABD_Handle *` |
213 | * @param vr_msg the incoming message | 213 | * @param vr_msg the incoming message |
214 | */ | 214 | */ |
215 | static void | 215 | static void |
216 | handle_result (void *cls, const struct DelegationChainResultMessage *vr_msg) | 216 | handle_result (void *cls, const struct DelegationChainResultMessage *vr_msg) |
217 | { | 217 | { |
218 | struct GNUNET_CREDENTIAL_Handle *handle = cls; | 218 | struct GNUNET_ABD_Handle *handle = cls; |
219 | uint32_t r_id = ntohl (vr_msg->id); | 219 | uint32_t r_id = ntohl (vr_msg->id); |
220 | struct GNUNET_CREDENTIAL_Request *vr; | 220 | struct GNUNET_ABD_Request *vr; |
221 | size_t mlen = ntohs (vr_msg->header.size) - sizeof (*vr_msg); | 221 | size_t mlen = ntohs (vr_msg->header.size) - sizeof (*vr_msg); |
222 | uint32_t d_count = ntohl (vr_msg->d_count); | 222 | uint32_t d_count = ntohl (vr_msg->d_count); |
223 | uint32_t c_count = ntohl (vr_msg->c_count); | 223 | uint32_t c_count = ntohl (vr_msg->c_count); |
224 | struct GNUNET_CREDENTIAL_Delegation d_chain[d_count]; | 224 | struct GNUNET_ABD_Delegation d_chain[d_count]; |
225 | struct GNUNET_CREDENTIAL_Delegate dels[c_count]; | 225 | struct GNUNET_ABD_Delegate dels[c_count]; |
226 | GNUNET_CREDENTIAL_CredentialResultProcessor proc; | 226 | GNUNET_ABD_CredentialResultProcessor proc; |
227 | void *proc_cls; | 227 | void *proc_cls; |
228 | 228 | ||
229 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 229 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
230 | "Received verify reply from CREDENTIAL service\n"); | 230 | "Received verify reply from ABD service\n"); |
231 | for (vr = handle->request_head; NULL != vr; vr = vr->next) | 231 | for (vr = handle->request_head; NULL != vr; vr = vr->next) |
232 | if (vr->r_id == r_id) | 232 | if (vr->r_id == r_id) |
233 | break; | 233 | break; |
@@ -240,7 +240,7 @@ handle_result (void *cls, const struct DelegationChainResultMessage *vr_msg) | |||
240 | GNUNET_free (vr); | 240 | GNUNET_free (vr); |
241 | GNUNET_assert ( | 241 | GNUNET_assert ( |
242 | GNUNET_OK == | 242 | GNUNET_OK == |
243 | GNUNET_CREDENTIAL_delegation_chain_deserialize (mlen, | 243 | GNUNET_ABD_delegation_chain_deserialize (mlen, |
244 | (const char *) &vr_msg[1], | 244 | (const char *) &vr_msg[1], |
245 | d_count, | 245 | d_count, |
246 | d_chain, | 246 | d_chain, |
@@ -267,17 +267,17 @@ check_intermediate (void *cls, const struct DelegationChainIntermediateMessage * | |||
267 | static void | 267 | static void |
268 | handle_intermediate (void *cls, const struct DelegationChainIntermediateMessage *vr_msg) | 268 | handle_intermediate (void *cls, const struct DelegationChainIntermediateMessage *vr_msg) |
269 | { | 269 | { |
270 | struct GNUNET_CREDENTIAL_Handle *handle = cls; | 270 | struct GNUNET_ABD_Handle *handle = cls; |
271 | uint32_t r_id = ntohl (vr_msg->id); | 271 | uint32_t r_id = ntohl (vr_msg->id); |
272 | uint32_t size = ntohl (vr_msg->size); | 272 | uint32_t size = ntohl (vr_msg->size); |
273 | bool is_bw = ntohs(vr_msg->is_bw); | 273 | bool is_bw = ntohs(vr_msg->is_bw); |
274 | struct GNUNET_CREDENTIAL_Request *vr; | 274 | struct GNUNET_ABD_Request *vr; |
275 | GNUNET_CREDENTIAL_IntermediateResultProcessor proc; | 275 | GNUNET_ABD_IntermediateResultProcessor proc; |
276 | void *proc_cls; | 276 | void *proc_cls; |
277 | struct GNUNET_CREDENTIAL_Delegation *dd; | 277 | struct GNUNET_ABD_Delegation *dd; |
278 | 278 | ||
279 | 279 | ||
280 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Received intermediate reply from CREDENTIAL service\n"); | 280 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Received intermediate reply from ABD service\n"); |
281 | 281 | ||
282 | for (vr = handle->request_head; NULL != vr; vr = vr->next) | 282 | for (vr = handle->request_head; NULL != vr; vr = vr->next) |
283 | if (vr->r_id == r_id) | 283 | if (vr->r_id == r_id) |
@@ -288,10 +288,10 @@ handle_intermediate (void *cls, const struct DelegationChainIntermediateMessage | |||
288 | proc = vr->int_proc; | 288 | proc = vr->int_proc; |
289 | proc_cls = vr->proc2_cls; | 289 | proc_cls = vr->proc2_cls; |
290 | 290 | ||
291 | dd = GNUNET_new (struct GNUNET_CREDENTIAL_Delegation); | 291 | dd = GNUNET_new (struct GNUNET_ABD_Delegation); |
292 | GNUNET_assert ( | 292 | GNUNET_assert ( |
293 | GNUNET_OK == | 293 | GNUNET_OK == |
294 | GNUNET_CREDENTIAL_delegation_chain_deserialize (size, | 294 | GNUNET_ABD_delegation_chain_deserialize (size, |
295 | (const char *) &vr_msg[1], | 295 | (const char *) &vr_msg[1], |
296 | 1, | 296 | 1, |
297 | dd, | 297 | dd, |
@@ -303,33 +303,33 @@ handle_intermediate (void *cls, const struct DelegationChainIntermediateMessage | |||
303 | 303 | ||
304 | 304 | ||
305 | /** | 305 | /** |
306 | * Reconnect to CREDENTIAL service. | 306 | * Reconnect to ABD service. |
307 | * | 307 | * |
308 | * @param handle the handle to the CREDENTIAL service | 308 | * @param handle the handle to the ABD service |
309 | */ | 309 | */ |
310 | static void | 310 | static void |
311 | reconnect (struct GNUNET_CREDENTIAL_Handle *handle) | 311 | reconnect (struct GNUNET_ABD_Handle *handle) |
312 | { | 312 | { |
313 | struct GNUNET_MQ_MessageHandler handlers[] = | 313 | struct GNUNET_MQ_MessageHandler handlers[] = |
314 | {GNUNET_MQ_hd_var_size (result, | 314 | {GNUNET_MQ_hd_var_size (result, |
315 | GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY_RESULT, | 315 | GNUNET_MESSAGE_TYPE_ABD_VERIFY_RESULT, |
316 | struct DelegationChainResultMessage, | 316 | struct DelegationChainResultMessage, |
317 | handle), | 317 | handle), |
318 | GNUNET_MQ_hd_var_size (result, | 318 | GNUNET_MQ_hd_var_size (result, |
319 | GNUNET_MESSAGE_TYPE_CREDENTIAL_COLLECT_RESULT, | 319 | GNUNET_MESSAGE_TYPE_ABD_COLLECT_RESULT, |
320 | struct DelegationChainResultMessage, | 320 | struct DelegationChainResultMessage, |
321 | handle), | 321 | handle), |
322 | GNUNET_MQ_hd_var_size (intermediate, | 322 | GNUNET_MQ_hd_var_size (intermediate, |
323 | GNUNET_MESSAGE_TYPE_CREDENTIAL_INTERMEDIATE_RESULT, | 323 | GNUNET_MESSAGE_TYPE_ABD_INTERMEDIATE_RESULT, |
324 | struct DelegationChainIntermediateMessage, | 324 | struct DelegationChainIntermediateMessage, |
325 | handle), | 325 | handle), |
326 | GNUNET_MQ_handler_end ()}; | 326 | GNUNET_MQ_handler_end ()}; |
327 | struct GNUNET_CREDENTIAL_Request *vr; | 327 | struct GNUNET_ABD_Request *vr; |
328 | 328 | ||
329 | GNUNET_assert (NULL == handle->mq); | 329 | GNUNET_assert (NULL == handle->mq); |
330 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Trying to connect to CREDENTIAL\n"); | 330 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Trying to connect to ABD\n"); |
331 | handle->mq = GNUNET_CLIENT_connect (handle->cfg, | 331 | handle->mq = GNUNET_CLIENT_connect (handle->cfg, |
332 | "credential", | 332 | "abd", |
333 | handlers, | 333 | handlers, |
334 | &mq_error_handler, | 334 | &mq_error_handler, |
335 | handle); | 335 | handle); |
@@ -341,17 +341,17 @@ reconnect (struct GNUNET_CREDENTIAL_Handle *handle) | |||
341 | 341 | ||
342 | 342 | ||
343 | /** | 343 | /** |
344 | * Initialize the connection with the CREDENTIAL service. | 344 | * Initialize the connection with the ABD service. |
345 | * | 345 | * |
346 | * @param cfg configuration to use | 346 | * @param cfg configuration to use |
347 | * @return handle to the CREDENTIAL service, or NULL on error | 347 | * @return handle to the ABD service, or NULL on error |
348 | */ | 348 | */ |
349 | struct GNUNET_CREDENTIAL_Handle * | 349 | struct GNUNET_ABD_Handle * |
350 | GNUNET_CREDENTIAL_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) | 350 | GNUNET_ABD_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) |
351 | { | 351 | { |
352 | struct GNUNET_CREDENTIAL_Handle *handle; | 352 | struct GNUNET_ABD_Handle *handle; |
353 | 353 | ||
354 | handle = GNUNET_new (struct GNUNET_CREDENTIAL_Handle); | 354 | handle = GNUNET_new (struct GNUNET_ABD_Handle); |
355 | handle->cfg = cfg; | 355 | handle->cfg = cfg; |
356 | reconnect (handle); | 356 | reconnect (handle); |
357 | if (NULL == handle->mq) | 357 | if (NULL == handle->mq) |
@@ -364,12 +364,12 @@ GNUNET_CREDENTIAL_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
364 | 364 | ||
365 | 365 | ||
366 | /** | 366 | /** |
367 | * Shutdown connection with the CREDENTIAL service. | 367 | * Shutdown connection with the ABD service. |
368 | * | 368 | * |
369 | * @param handle handle of the CREDENTIAL connection to stop | 369 | * @param handle handle of the ABD connection to stop |
370 | */ | 370 | */ |
371 | void | 371 | void |
372 | GNUNET_CREDENTIAL_disconnect (struct GNUNET_CREDENTIAL_Handle *handle) | 372 | GNUNET_ABD_disconnect (struct GNUNET_ABD_Handle *handle) |
373 | { | 373 | { |
374 | if (NULL != handle->mq) | 374 | if (NULL != handle->mq) |
375 | { | 375 | { |
@@ -392,9 +392,9 @@ GNUNET_CREDENTIAL_disconnect (struct GNUNET_CREDENTIAL_Handle *handle) | |||
392 | * @param lr the verify request to cancel | 392 | * @param lr the verify request to cancel |
393 | */ | 393 | */ |
394 | void | 394 | void |
395 | GNUNET_CREDENTIAL_request_cancel (struct GNUNET_CREDENTIAL_Request *lr) | 395 | GNUNET_ABD_request_cancel (struct GNUNET_ABD_Request *lr) |
396 | { | 396 | { |
397 | struct GNUNET_CREDENTIAL_Handle *handle = lr->credential_handle; | 397 | struct GNUNET_ABD_Handle *handle = lr->abd_handle; |
398 | 398 | ||
399 | GNUNET_CONTAINER_DLL_remove (handle->request_head, handle->request_tail, lr); | 399 | GNUNET_CONTAINER_DLL_remove (handle->request_head, handle->request_tail, lr); |
400 | GNUNET_MQ_discard (lr->env); | 400 | GNUNET_MQ_discard (lr->env); |
@@ -404,7 +404,7 @@ GNUNET_CREDENTIAL_request_cancel (struct GNUNET_CREDENTIAL_Request *lr) | |||
404 | 404 | ||
405 | /** | 405 | /** |
406 | * Performs attribute collection. | 406 | * Performs attribute collection. |
407 | * Collects all credentials of subject to fulfill the | 407 | * Collects all abds of subject to fulfill the |
408 | * attribute, if possible | 408 | * attribute, if possible |
409 | * | 409 | * |
410 | * @param handle handle to the Credential service | 410 | * @param handle handle to the Credential service |
@@ -415,21 +415,21 @@ GNUNET_CREDENTIAL_request_cancel (struct GNUNET_CREDENTIAL_Request *lr) | |||
415 | * @param proc_cls closure for processor | 415 | * @param proc_cls closure for processor |
416 | * @return handle to the queued request | 416 | * @return handle to the queued request |
417 | */ | 417 | */ |
418 | struct GNUNET_CREDENTIAL_Request * | 418 | struct GNUNET_ABD_Request * |
419 | GNUNET_CREDENTIAL_collect ( | 419 | GNUNET_ABD_collect ( |
420 | struct GNUNET_CREDENTIAL_Handle *handle, | 420 | struct GNUNET_ABD_Handle *handle, |
421 | const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key, | 421 | const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key, |
422 | const char *issuer_attribute, | 422 | const char *issuer_attribute, |
423 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *subject_key, | 423 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *subject_key, |
424 | enum GNUNET_CREDENTIAL_AlgoDirectionFlags direction, | 424 | enum GNUNET_ABD_AlgoDirectionFlags direction, |
425 | GNUNET_CREDENTIAL_CredentialResultProcessor proc, | 425 | GNUNET_ABD_CredentialResultProcessor proc, |
426 | void *proc_cls, | 426 | void *proc_cls, |
427 | GNUNET_CREDENTIAL_IntermediateResultProcessor proc2, | 427 | GNUNET_ABD_IntermediateResultProcessor proc2, |
428 | void *proc2_cls) | 428 | void *proc2_cls) |
429 | { | 429 | { |
430 | /* IPC to shorten credential names, return shorten_handle */ | 430 | /* IPC to shorten abd names, return shorten_handle */ |
431 | struct CollectMessage *c_msg; | 431 | struct CollectMessage *c_msg; |
432 | struct GNUNET_CREDENTIAL_Request *vr; | 432 | struct GNUNET_ABD_Request *vr; |
433 | size_t nlen; | 433 | size_t nlen; |
434 | 434 | ||
435 | if (NULL == issuer_attribute) | 435 | if (NULL == issuer_attribute) |
@@ -440,7 +440,7 @@ GNUNET_CREDENTIAL_collect ( | |||
440 | 440 | ||
441 | //DEBUG LOG | 441 | //DEBUG LOG |
442 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 442 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
443 | "Trying to collect `%s' in CREDENTIAL\n", | 443 | "Trying to collect `%s' in ABD\n", |
444 | issuer_attribute); | 444 | issuer_attribute); |
445 | nlen = strlen (issuer_attribute) + 1; | 445 | nlen = strlen (issuer_attribute) + 1; |
446 | if (nlen >= GNUNET_MAX_MESSAGE_SIZE - sizeof (*vr)) | 446 | if (nlen >= GNUNET_MAX_MESSAGE_SIZE - sizeof (*vr)) |
@@ -448,15 +448,15 @@ GNUNET_CREDENTIAL_collect ( | |||
448 | GNUNET_break (0); | 448 | GNUNET_break (0); |
449 | return NULL; | 449 | return NULL; |
450 | } | 450 | } |
451 | vr = GNUNET_new (struct GNUNET_CREDENTIAL_Request); | 451 | vr = GNUNET_new (struct GNUNET_ABD_Request); |
452 | vr->credential_handle = handle; | 452 | vr->abd_handle = handle; |
453 | vr->verify_proc = proc; | 453 | vr->verify_proc = proc; |
454 | vr->proc_cls = proc_cls; | 454 | vr->proc_cls = proc_cls; |
455 | vr->int_proc = proc2; | 455 | vr->int_proc = proc2; |
456 | vr->proc2_cls = proc2_cls; | 456 | vr->proc2_cls = proc2_cls; |
457 | vr->r_id = handle->r_id_gen++; | 457 | vr->r_id = handle->r_id_gen++; |
458 | vr->env = | 458 | vr->env = |
459 | GNUNET_MQ_msg_extra (c_msg, nlen, GNUNET_MESSAGE_TYPE_CREDENTIAL_COLLECT); | 459 | GNUNET_MQ_msg_extra (c_msg, nlen, GNUNET_MESSAGE_TYPE_ABD_COLLECT); |
460 | c_msg->id = htonl (vr->r_id); | 460 | c_msg->id = htonl (vr->r_id); |
461 | c_msg->subject_key = *subject_key; | 461 | c_msg->subject_key = *subject_key; |
462 | c_msg->issuer_key = *issuer_key; | 462 | c_msg->issuer_key = *issuer_key; |
@@ -487,23 +487,23 @@ GNUNET_CREDENTIAL_collect ( | |||
487 | * @param proc_cls closure for processor | 487 | * @param proc_cls closure for processor |
488 | * @return handle to the queued request | 488 | * @return handle to the queued request |
489 | */ | 489 | */ |
490 | struct GNUNET_CREDENTIAL_Request * | 490 | struct GNUNET_ABD_Request * |
491 | GNUNET_CREDENTIAL_verify ( | 491 | GNUNET_ABD_verify ( |
492 | struct GNUNET_CREDENTIAL_Handle *handle, | 492 | struct GNUNET_ABD_Handle *handle, |
493 | const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key, | 493 | const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key, |
494 | const char *issuer_attribute, | 494 | const char *issuer_attribute, |
495 | const struct GNUNET_CRYPTO_EcdsaPublicKey *subject_key, | 495 | const struct GNUNET_CRYPTO_EcdsaPublicKey *subject_key, |
496 | uint32_t delegate_count, | 496 | uint32_t delegate_count, |
497 | const struct GNUNET_CREDENTIAL_Delegate *delegates, | 497 | const struct GNUNET_ABD_Delegate *delegates, |
498 | enum GNUNET_CREDENTIAL_AlgoDirectionFlags direction, | 498 | enum GNUNET_ABD_AlgoDirectionFlags direction, |
499 | GNUNET_CREDENTIAL_CredentialResultProcessor proc, | 499 | GNUNET_ABD_CredentialResultProcessor proc, |
500 | void *proc_cls, | 500 | void *proc_cls, |
501 | GNUNET_CREDENTIAL_IntermediateResultProcessor proc2, | 501 | GNUNET_ABD_IntermediateResultProcessor proc2, |
502 | void *proc2_cls) | 502 | void *proc2_cls) |
503 | { | 503 | { |
504 | /* IPC to shorten credential names, return shorten_handle */ | 504 | /* IPC to shorten abd names, return shorten_handle */ |
505 | struct VerifyMessage *v_msg; | 505 | struct VerifyMessage *v_msg; |
506 | struct GNUNET_CREDENTIAL_Request *vr; | 506 | struct GNUNET_ABD_Request *vr; |
507 | size_t nlen; | 507 | size_t nlen; |
508 | size_t clen; | 508 | size_t clen; |
509 | 509 | ||
@@ -513,11 +513,11 @@ GNUNET_CREDENTIAL_verify ( | |||
513 | return NULL; | 513 | return NULL; |
514 | } | 514 | } |
515 | 515 | ||
516 | clen = GNUNET_CREDENTIAL_delegates_get_size (delegate_count, delegates); | 516 | clen = GNUNET_ABD_delegates_get_size (delegate_count, delegates); |
517 | 517 | ||
518 | //DEBUG LOG | 518 | //DEBUG LOG |
519 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 519 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
520 | "Trying to verify `%s' in CREDENTIAL\n", | 520 | "Trying to verify `%s' in ABD\n", |
521 | issuer_attribute); | 521 | issuer_attribute); |
522 | nlen = strlen (issuer_attribute) + 1 + clen; | 522 | nlen = strlen (issuer_attribute) + 1 + clen; |
523 | if (nlen >= GNUNET_MAX_MESSAGE_SIZE - sizeof (*vr)) | 523 | if (nlen >= GNUNET_MAX_MESSAGE_SIZE - sizeof (*vr)) |
@@ -525,15 +525,15 @@ GNUNET_CREDENTIAL_verify ( | |||
525 | GNUNET_break (0); | 525 | GNUNET_break (0); |
526 | return NULL; | 526 | return NULL; |
527 | } | 527 | } |
528 | vr = GNUNET_new (struct GNUNET_CREDENTIAL_Request); | 528 | vr = GNUNET_new (struct GNUNET_ABD_Request); |
529 | vr->credential_handle = handle; | 529 | vr->abd_handle = handle; |
530 | vr->verify_proc = proc; | 530 | vr->verify_proc = proc; |
531 | vr->proc_cls = proc_cls; | 531 | vr->proc_cls = proc_cls; |
532 | vr->int_proc = proc2; | 532 | vr->int_proc = proc2; |
533 | vr->proc2_cls = proc2_cls; | 533 | vr->proc2_cls = proc2_cls; |
534 | vr->r_id = handle->r_id_gen++; | 534 | vr->r_id = handle->r_id_gen++; |
535 | vr->env = | 535 | vr->env = |
536 | GNUNET_MQ_msg_extra (v_msg, nlen, GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY); | 536 | GNUNET_MQ_msg_extra (v_msg, nlen, GNUNET_MESSAGE_TYPE_ABD_VERIFY); |
537 | v_msg->id = htonl (vr->r_id); | 537 | v_msg->id = htonl (vr->r_id); |
538 | v_msg->subject_key = *subject_key; | 538 | v_msg->subject_key = *subject_key; |
539 | v_msg->d_count = htonl (delegate_count); | 539 | v_msg->d_count = htonl (delegate_count); |
@@ -542,7 +542,7 @@ GNUNET_CREDENTIAL_verify ( | |||
542 | v_msg->resolution_algo = htons (direction); | 542 | v_msg->resolution_algo = htons (direction); |
543 | 543 | ||
544 | GNUNET_memcpy (&v_msg[1], issuer_attribute, strlen (issuer_attribute)); | 544 | GNUNET_memcpy (&v_msg[1], issuer_attribute, strlen (issuer_attribute)); |
545 | GNUNET_CREDENTIAL_delegates_serialize (delegate_count, | 545 | GNUNET_ABD_delegates_serialize (delegate_count, |
546 | delegates, | 546 | delegates, |
547 | clen, | 547 | clen, |
548 | ((char *) &v_msg[1]) + | 548 | ((char *) &v_msg[1]) + |
@@ -553,4 +553,4 @@ GNUNET_CREDENTIAL_verify ( | |||
553 | return vr; | 553 | return vr; |
554 | } | 554 | } |
555 | 555 | ||
556 | /* end of credential_api.c */ | 556 | /* end of abd_api.c */ |
diff --git a/src/credential/credential_serialization.c b/src/abd/abd_serialization.c index 8d8eafa44..d2bc15166 100644 --- a/src/credential/credential_serialization.c +++ b/src/abd/abd_serialization.c | |||
@@ -20,30 +20,30 @@ | |||
20 | 20 | ||
21 | 21 | ||
22 | /** | 22 | /** |
23 | * @file credential/credential_serialization.c | 23 | * @file abd/abd_serialization.c |
24 | * @brief API to serialize and deserialize delegation chains | 24 | * @brief API to serialize and deserialize delegation chains |
25 | * and credentials | 25 | * and abds |
26 | * @author Martin Schanzenbach | 26 | * @author Martin Schanzenbach |
27 | */ | 27 | */ |
28 | #include "platform.h" | 28 | #include "platform.h" |
29 | #include "gnunet_util_lib.h" | 29 | #include "gnunet_util_lib.h" |
30 | #include "gnunet_constants.h" | 30 | #include "gnunet_constants.h" |
31 | #include "gnunet_credential_service.h" | 31 | #include "gnunet_abd_service.h" |
32 | #include "gnunet_signatures.h" | 32 | #include "gnunet_signatures.h" |
33 | #include "credential.h" | 33 | #include "abd.h" |
34 | 34 | ||
35 | /** | 35 | /** |
36 | * Calculate how many bytes we will need to serialize | 36 | * Calculate how many bytes we will need to serialize |
37 | * the given delegation chain | 37 | * the given delegation chain |
38 | * | 38 | * |
39 | * @param ds_count number of delegation chain entries | 39 | * @param ds_count number of delegation chain entries |
40 | * @param dsr array of #GNUNET_CREDENTIAL_DelegationSet | 40 | * @param dsr array of #GNUNET_ABD_DelegationSet |
41 | * @return the required size to serialize | 41 | * @return the required size to serialize |
42 | */ | 42 | */ |
43 | size_t | 43 | size_t |
44 | GNUNET_CREDENTIAL_delegation_set_get_size ( | 44 | GNUNET_ABD_delegation_set_get_size ( |
45 | unsigned int ds_count, | 45 | unsigned int ds_count, |
46 | const struct GNUNET_CREDENTIAL_DelegationSet *dsr) | 46 | const struct GNUNET_ABD_DelegationSet *dsr) |
47 | { | 47 | { |
48 | unsigned int i; | 48 | unsigned int i; |
49 | size_t ret; | 49 | size_t ret; |
@@ -59,18 +59,18 @@ GNUNET_CREDENTIAL_delegation_set_get_size ( | |||
59 | } | 59 | } |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * Serizalize the given delegation chain entries and credential | 62 | * Serizalize the given delegation chain entries and abd |
63 | * | 63 | * |
64 | * @param d_count number of delegation chain entries | 64 | * @param d_count number of delegation chain entries |
65 | * @param dsr array of #GNUNET_CREDENTIAL_DelegationSet | 65 | * @param dsr array of #GNUNET_ABD_DelegationSet |
66 | * @param dest_size size of the destination | 66 | * @param dest_size size of the destination |
67 | * @param dest where to store the result | 67 | * @param dest where to store the result |
68 | * @return the size of the data, -1 on failure | 68 | * @return the size of the data, -1 on failure |
69 | */ | 69 | */ |
70 | ssize_t | 70 | ssize_t |
71 | GNUNET_CREDENTIAL_delegation_set_serialize ( | 71 | GNUNET_ABD_delegation_set_serialize ( |
72 | unsigned int d_count, | 72 | unsigned int d_count, |
73 | const struct GNUNET_CREDENTIAL_DelegationSet *dsr, | 73 | const struct GNUNET_ABD_DelegationSet *dsr, |
74 | size_t dest_size, | 74 | size_t dest_size, |
75 | char *dest) | 75 | char *dest) |
76 | { | 76 | { |
@@ -110,11 +110,11 @@ GNUNET_CREDENTIAL_delegation_set_serialize ( | |||
110 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error | 110 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error |
111 | */ | 111 | */ |
112 | int | 112 | int |
113 | GNUNET_CREDENTIAL_delegation_set_deserialize ( | 113 | GNUNET_ABD_delegation_set_deserialize ( |
114 | size_t len, | 114 | size_t len, |
115 | const char *src, | 115 | const char *src, |
116 | unsigned int d_count, | 116 | unsigned int d_count, |
117 | struct GNUNET_CREDENTIAL_DelegationSet *dsr) | 117 | struct GNUNET_ABD_DelegationSet *dsr) |
118 | { | 118 | { |
119 | struct DelegationRecordData rec; | 119 | struct DelegationRecordData rec; |
120 | unsigned int i; | 120 | unsigned int i; |
@@ -140,16 +140,16 @@ GNUNET_CREDENTIAL_delegation_set_deserialize ( | |||
140 | 140 | ||
141 | /** | 141 | /** |
142 | * Calculate how many bytes we will need to serialize | 142 | * Calculate how many bytes we will need to serialize |
143 | * the credentials | 143 | * the abds |
144 | * | 144 | * |
145 | * @param c_count number of credential entries | 145 | * @param c_count number of abd entries |
146 | * @param cd a #GNUNET_CREDENTIAL_Credential | 146 | * @param cd a #GNUNET_ABD_Credential |
147 | * @return the required size to serialize | 147 | * @return the required size to serialize |
148 | */ | 148 | */ |
149 | size_t | 149 | size_t |
150 | GNUNET_CREDENTIAL_delegates_get_size ( | 150 | GNUNET_ABD_delegates_get_size ( |
151 | unsigned int c_count, | 151 | unsigned int c_count, |
152 | const struct GNUNET_CREDENTIAL_Delegate *cd) | 152 | const struct GNUNET_ABD_Delegate *cd) |
153 | { | 153 | { |
154 | unsigned int i; | 154 | unsigned int i; |
155 | size_t ret; | 155 | size_t ret; |
@@ -165,18 +165,18 @@ GNUNET_CREDENTIAL_delegates_get_size ( | |||
165 | return ret; | 165 | return ret; |
166 | } | 166 | } |
167 | /** | 167 | /** |
168 | * Serizalize the given credentials | 168 | * Serizalize the given abds |
169 | * | 169 | * |
170 | * @param c_count number of credential entries | 170 | * @param c_count number of abd entries |
171 | * @param cd a #GNUNET_CREDENTIAL_Credential | 171 | * @param cd a #GNUNET_ABD_Credential |
172 | * @param dest_size size of the destination | 172 | * @param dest_size size of the destination |
173 | * @param dest where to store the result | 173 | * @param dest where to store the result |
174 | * @return the size of the data, -1 on failure | 174 | * @return the size of the data, -1 on failure |
175 | */ | 175 | */ |
176 | ssize_t | 176 | ssize_t |
177 | GNUNET_CREDENTIAL_delegates_serialize ( | 177 | GNUNET_ABD_delegates_serialize ( |
178 | unsigned int c_count, | 178 | unsigned int c_count, |
179 | const struct GNUNET_CREDENTIAL_Delegate *cd, | 179 | const struct GNUNET_ABD_Delegate *cd, |
180 | size_t dest_size, | 180 | size_t dest_size, |
181 | char *dest) | 181 | char *dest) |
182 | { | 182 | { |
@@ -218,15 +218,15 @@ GNUNET_CREDENTIAL_delegates_serialize ( | |||
218 | * | 218 | * |
219 | * @param len size of the serialized creds | 219 | * @param len size of the serialized creds |
220 | * @param src the serialized data | 220 | * @param src the serialized data |
221 | * @param c_count the number of credential entries | 221 | * @param c_count the number of abd entries |
222 | * @param cd where to put the credential data | 222 | * @param cd where to put the abd data |
223 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error | 223 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error |
224 | */ | 224 | */ |
225 | int | 225 | int |
226 | GNUNET_CREDENTIAL_delegates_deserialize (size_t len, | 226 | GNUNET_ABD_delegates_deserialize (size_t len, |
227 | const char *src, | 227 | const char *src, |
228 | unsigned int c_count, | 228 | unsigned int c_count, |
229 | struct GNUNET_CREDENTIAL_Delegate *cd) | 229 | struct GNUNET_ABD_Delegate *cd) |
230 | { | 230 | { |
231 | struct DelegateEntry c_rec; | 231 | struct DelegateEntry c_rec; |
232 | unsigned int i; | 232 | unsigned int i; |
@@ -256,20 +256,20 @@ GNUNET_CREDENTIAL_delegates_deserialize (size_t len, | |||
256 | 256 | ||
257 | /** | 257 | /** |
258 | * Calculate how many bytes we will need to serialize | 258 | * Calculate how many bytes we will need to serialize |
259 | * the given delegation chain and credential | 259 | * the given delegation chain and abd |
260 | * | 260 | * |
261 | * @param d_count number of delegation chain entries | 261 | * @param d_count number of delegation chain entries |
262 | * @param dd array of #GNUNET_CREDENTIAL_Delegation | 262 | * @param dd array of #GNUNET_ABD_Delegation |
263 | * @param c_count number of credential entries | 263 | * @param c_count number of abd entries |
264 | * @param cd a #GNUNET_CREDENTIAL_Credential | 264 | * @param cd a #GNUNET_ABD_Credential |
265 | * @return the required size to serialize | 265 | * @return the required size to serialize |
266 | */ | 266 | */ |
267 | size_t | 267 | size_t |
268 | GNUNET_CREDENTIAL_delegation_chain_get_size ( | 268 | GNUNET_ABD_delegation_chain_get_size ( |
269 | unsigned int d_count, | 269 | unsigned int d_count, |
270 | const struct GNUNET_CREDENTIAL_Delegation *dd, | 270 | const struct GNUNET_ABD_Delegation *dd, |
271 | unsigned int c_count, | 271 | unsigned int c_count, |
272 | const struct GNUNET_CREDENTIAL_Delegate *cd) | 272 | const struct GNUNET_ABD_Delegate *cd) |
273 | { | 273 | { |
274 | unsigned int i; | 274 | unsigned int i; |
275 | size_t ret; | 275 | size_t ret; |
@@ -282,26 +282,26 @@ GNUNET_CREDENTIAL_delegation_chain_get_size ( | |||
282 | (ret + dd[i].issuer_attribute_len + dd[i].subject_attribute_len) >= ret); | 282 | (ret + dd[i].issuer_attribute_len + dd[i].subject_attribute_len) >= ret); |
283 | ret += dd[i].issuer_attribute_len + dd[i].subject_attribute_len; | 283 | ret += dd[i].issuer_attribute_len + dd[i].subject_attribute_len; |
284 | } | 284 | } |
285 | return ret + GNUNET_CREDENTIAL_delegates_get_size (c_count, cd); | 285 | return ret + GNUNET_ABD_delegates_get_size (c_count, cd); |
286 | } | 286 | } |
287 | 287 | ||
288 | /** | 288 | /** |
289 | * Serizalize the given delegation chain entries and credential | 289 | * Serizalize the given delegation chain entries and abd |
290 | * | 290 | * |
291 | * @param d_count number of delegation chain entries | 291 | * @param d_count number of delegation chain entries |
292 | * @param dd array of #GNUNET_CREDENTIAL_Delegation | 292 | * @param dd array of #GNUNET_ABD_Delegation |
293 | * @param c_count number of credential entries | 293 | * @param c_count number of abd entries |
294 | * @param cd a #GNUNET_CREDENTIAL_Credential | 294 | * @param cd a #GNUNET_ABD_Credential |
295 | * @param dest_size size of the destination | 295 | * @param dest_size size of the destination |
296 | * @param dest where to store the result | 296 | * @param dest where to store the result |
297 | * @return the size of the data, -1 on failure | 297 | * @return the size of the data, -1 on failure |
298 | */ | 298 | */ |
299 | ssize_t | 299 | ssize_t |
300 | GNUNET_CREDENTIAL_delegation_chain_serialize ( | 300 | GNUNET_ABD_delegation_chain_serialize ( |
301 | unsigned int d_count, | 301 | unsigned int d_count, |
302 | const struct GNUNET_CREDENTIAL_Delegation *dd, | 302 | const struct GNUNET_ABD_Delegation *dd, |
303 | unsigned int c_count, | 303 | unsigned int c_count, |
304 | const struct GNUNET_CREDENTIAL_Delegate *cd, | 304 | const struct GNUNET_ABD_Delegate *cd, |
305 | size_t dest_size, | 305 | size_t dest_size, |
306 | char *dest) | 306 | char *dest) |
307 | { | 307 | { |
@@ -335,7 +335,7 @@ GNUNET_CREDENTIAL_delegation_chain_serialize ( | |||
335 | dd[i].subject_attribute_len); | 335 | dd[i].subject_attribute_len); |
336 | off += dd[i].subject_attribute_len; | 336 | off += dd[i].subject_attribute_len; |
337 | } | 337 | } |
338 | return off + GNUNET_CREDENTIAL_delegates_serialize (c_count, | 338 | return off + GNUNET_ABD_delegates_serialize (c_count, |
339 | cd, | 339 | cd, |
340 | dest_size - off, | 340 | dest_size - off, |
341 | &dest[off]); | 341 | &dest[off]); |
@@ -349,18 +349,18 @@ GNUNET_CREDENTIAL_delegation_chain_serialize ( | |||
349 | * @param src the serialized data | 349 | * @param src the serialized data |
350 | * @param d_count the number of delegation chain entries | 350 | * @param d_count the number of delegation chain entries |
351 | * @param dd where to put the delegation chain entries | 351 | * @param dd where to put the delegation chain entries |
352 | * @param c_count the number of credential entries | 352 | * @param c_count the number of abd entries |
353 | * @param cd where to put the credential data | 353 | * @param cd where to put the abd data |
354 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error | 354 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error |
355 | */ | 355 | */ |
356 | int | 356 | int |
357 | GNUNET_CREDENTIAL_delegation_chain_deserialize ( | 357 | GNUNET_ABD_delegation_chain_deserialize ( |
358 | size_t len, | 358 | size_t len, |
359 | const char *src, | 359 | const char *src, |
360 | unsigned int d_count, | 360 | unsigned int d_count, |
361 | struct GNUNET_CREDENTIAL_Delegation *dd, | 361 | struct GNUNET_ABD_Delegation *dd, |
362 | unsigned int c_count, | 362 | unsigned int c_count, |
363 | struct GNUNET_CREDENTIAL_Delegate *cd) | 363 | struct GNUNET_ABD_Delegate *cd) |
364 | { | 364 | { |
365 | struct ChainEntry rec; | 365 | struct ChainEntry rec; |
366 | unsigned int i; | 366 | unsigned int i; |
@@ -386,14 +386,14 @@ GNUNET_CREDENTIAL_delegation_chain_deserialize ( | |||
386 | dd[i].subject_attribute = &src[off]; | 386 | dd[i].subject_attribute = &src[off]; |
387 | off += dd[i].subject_attribute_len; | 387 | off += dd[i].subject_attribute_len; |
388 | } | 388 | } |
389 | return GNUNET_CREDENTIAL_delegates_deserialize (len - off, | 389 | return GNUNET_ABD_delegates_deserialize (len - off, |
390 | &src[off], | 390 | &src[off], |
391 | c_count, | 391 | c_count, |
392 | cd); | 392 | cd); |
393 | } | 393 | } |
394 | 394 | ||
395 | int | 395 | int |
396 | GNUNET_CREDENTIAL_delegate_serialize (struct GNUNET_CREDENTIAL_Delegate *dele, | 396 | GNUNET_ABD_delegate_serialize (struct GNUNET_ABD_Delegate *dele, |
397 | char **data) | 397 | char **data) |
398 | { | 398 | { |
399 | size_t size; | 399 | size_t size; |
@@ -455,10 +455,10 @@ GNUNET_CREDENTIAL_delegate_serialize (struct GNUNET_CREDENTIAL_Delegate *dele, | |||
455 | return size; | 455 | return size; |
456 | } | 456 | } |
457 | 457 | ||
458 | struct GNUNET_CREDENTIAL_Delegate * | 458 | struct GNUNET_ABD_Delegate * |
459 | GNUNET_CREDENTIAL_delegate_deserialize (const char *data, size_t data_size) | 459 | GNUNET_ABD_delegate_deserialize (const char *data, size_t data_size) |
460 | { | 460 | { |
461 | struct GNUNET_CREDENTIAL_Delegate *dele; | 461 | struct GNUNET_ABD_Delegate *dele; |
462 | struct DelegateEntry *cdata; | 462 | struct DelegateEntry *cdata; |
463 | char *attr_combo_str; | 463 | char *attr_combo_str; |
464 | 464 | ||
@@ -480,7 +480,7 @@ GNUNET_CREDENTIAL_delegate_deserialize (const char *data, size_t data_size) | |||
480 | int attr_combo_len = iss_len + sub_len; | 480 | int attr_combo_len = iss_len + sub_len; |
481 | 481 | ||
482 | dele = | 482 | dele = |
483 | GNUNET_malloc (sizeof (struct GNUNET_CREDENTIAL_Delegate) + attr_combo_len); | 483 | GNUNET_malloc (sizeof (struct GNUNET_ABD_Delegate) + attr_combo_len); |
484 | 484 | ||
485 | dele->issuer_key = cdata->issuer_key; | 485 | dele->issuer_key = cdata->issuer_key; |
486 | dele->subject_key = cdata->subject_key; | 486 | dele->subject_key = cdata->subject_key; |
@@ -505,4 +505,4 @@ GNUNET_CREDENTIAL_delegate_deserialize (const char *data, size_t data_size) | |||
505 | return dele; | 505 | return dele; |
506 | } | 506 | } |
507 | 507 | ||
508 | /* end of credential_serialization.c */ | 508 | /* end of abd_serialization.c */ |
diff --git a/src/credential/credential_serialization.h b/src/abd/abd_serialization.h index 0e106caa1..cef9f42ef 100644 --- a/src/credential/credential_serialization.h +++ b/src/abd/abd_serialization.h | |||
@@ -20,45 +20,45 @@ | |||
20 | 20 | ||
21 | 21 | ||
22 | /** | 22 | /** |
23 | * @file credential/credential_serialization.h | 23 | * @file abd/abd_serialization.h |
24 | * @brief API to serialize and deserialize delegation chains | 24 | * @brief API to serialize and deserialize delegation chains |
25 | * and credentials | 25 | * and abds |
26 | * @author Martin Schanzenbach | 26 | * @author Martin Schanzenbach |
27 | */ | 27 | */ |
28 | #ifndef CREDENTIAL_SERIALIZATION_H | 28 | #ifndef ABD_SERIALIZATION_H |
29 | #define CREDENTIAL_SERIALIZATION_H | 29 | #define ABD_SERIALIZATION_H |
30 | 30 | ||
31 | #include "platform.h" | 31 | #include "platform.h" |
32 | #include "gnunet_util_lib.h" | 32 | #include "gnunet_util_lib.h" |
33 | #include "gnunet_constants.h" | 33 | #include "gnunet_constants.h" |
34 | #include "gnunet_credential_service.h" | 34 | #include "gnunet_abd_service.h" |
35 | 35 | ||
36 | /** | 36 | /** |
37 | * Calculate how many bytes we will need to serialize | 37 | * Calculate how many bytes we will need to serialize |
38 | * the given delegation record | 38 | * the given delegation record |
39 | * | 39 | * |
40 | * @param ds_count number of delegation chain entries | 40 | * @param ds_count number of delegation chain entries |
41 | * @param dsr array of #GNUNET_CREDENTIAL_Delegation | 41 | * @param dsr array of #GNUNET_ABD_Delegation |
42 | * @return the required size to serialize | 42 | * @return the required size to serialize |
43 | */ | 43 | */ |
44 | size_t | 44 | size_t |
45 | GNUNET_CREDENTIAL_delegation_set_get_size ( | 45 | GNUNET_ABD_delegation_set_get_size ( |
46 | unsigned int ds_count, | 46 | unsigned int ds_count, |
47 | const struct GNUNET_CREDENTIAL_DelegationSet *dsr); | 47 | const struct GNUNET_ABD_DelegationSet *dsr); |
48 | 48 | ||
49 | /** | 49 | /** |
50 | * Serizalize the given delegation record entries | 50 | * Serizalize the given delegation record entries |
51 | * | 51 | * |
52 | * @param d_count number of delegation chain entries | 52 | * @param d_count number of delegation chain entries |
53 | * @param dsr array of #GNUNET_CREDENTIAL_Delegation | 53 | * @param dsr array of #GNUNET_ABD_Delegation |
54 | * @param dest_size size of the destination | 54 | * @param dest_size size of the destination |
55 | * @param dest where to store the result | 55 | * @param dest where to store the result |
56 | * @return the size of the data, -1 on failure | 56 | * @return the size of the data, -1 on failure |
57 | */ | 57 | */ |
58 | ssize_t | 58 | ssize_t |
59 | GNUNET_CREDENTIAL_delegation_set_serialize ( | 59 | GNUNET_ABD_delegation_set_serialize ( |
60 | unsigned int d_count, | 60 | unsigned int d_count, |
61 | const struct GNUNET_CREDENTIAL_DelegationSet *dsr, | 61 | const struct GNUNET_ABD_DelegationSet *dsr, |
62 | size_t dest_size, | 62 | size_t dest_size, |
63 | char *dest); | 63 | char *dest); |
64 | 64 | ||
@@ -73,46 +73,46 @@ GNUNET_CREDENTIAL_delegation_set_serialize ( | |||
73 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error | 73 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error |
74 | */ | 74 | */ |
75 | int | 75 | int |
76 | GNUNET_CREDENTIAL_delegation_set_deserialize ( | 76 | GNUNET_ABD_delegation_set_deserialize ( |
77 | size_t len, | 77 | size_t len, |
78 | const char *src, | 78 | const char *src, |
79 | unsigned int d_count, | 79 | unsigned int d_count, |
80 | struct GNUNET_CREDENTIAL_DelegationSet *dsr); | 80 | struct GNUNET_ABD_DelegationSet *dsr); |
81 | 81 | ||
82 | /** | 82 | /** |
83 | * Calculate how many bytes we will need to serialize | 83 | * Calculate how many bytes we will need to serialize |
84 | * the given delegation chain and credential | 84 | * the given delegation chain and abd |
85 | * | 85 | * |
86 | * @param d_count number of delegation chain entries | 86 | * @param d_count number of delegation chain entries |
87 | * @param dd array of #GNUNET_CREDENTIAL_Delegation | 87 | * @param dd array of #GNUNET_ABD_Delegation |
88 | * @param c_count number of credential entries | 88 | * @param c_count number of abd entries |
89 | * @param cd a #GNUNET_CREDENTIAL_Delegate | 89 | * @param cd a #GNUNET_ABD_Delegate |
90 | * @return the required size to serialize | 90 | * @return the required size to serialize |
91 | */ | 91 | */ |
92 | size_t | 92 | size_t |
93 | GNUNET_CREDENTIAL_delegation_chain_get_size ( | 93 | GNUNET_ABD_delegation_chain_get_size ( |
94 | unsigned int d_count, | 94 | unsigned int d_count, |
95 | const struct GNUNET_CREDENTIAL_Delegation *dd, | 95 | const struct GNUNET_ABD_Delegation *dd, |
96 | unsigned int c_count, | 96 | unsigned int c_count, |
97 | const struct GNUNET_CREDENTIAL_Delegate *cd); | 97 | const struct GNUNET_ABD_Delegate *cd); |
98 | 98 | ||
99 | /** | 99 | /** |
100 | * Serizalize the given delegation chain entries and credential | 100 | * Serizalize the given delegation chain entries and abd |
101 | * | 101 | * |
102 | * @param d_count number of delegation chain entries | 102 | * @param d_count number of delegation chain entries |
103 | * @param dd array of #GNUNET_CREDENTIAL_Delegation | 103 | * @param dd array of #GNUNET_ABD_Delegation |
104 | * @param c_count number of credential entries | 104 | * @param c_count number of abd entries |
105 | * @param cd a #GNUNET_CREDENTIAL_Delegate | 105 | * @param cd a #GNUNET_ABD_Delegate |
106 | * @param dest_size size of the destination | 106 | * @param dest_size size of the destination |
107 | * @param dest where to store the result | 107 | * @param dest where to store the result |
108 | * @return the size of the data, -1 on failure | 108 | * @return the size of the data, -1 on failure |
109 | */ | 109 | */ |
110 | ssize_t | 110 | ssize_t |
111 | GNUNET_CREDENTIAL_delegation_chain_serialize ( | 111 | GNUNET_ABD_delegation_chain_serialize ( |
112 | unsigned int d_count, | 112 | unsigned int d_count, |
113 | const struct GNUNET_CREDENTIAL_Delegation *dd, | 113 | const struct GNUNET_ABD_Delegation *dd, |
114 | unsigned int c_count, | 114 | unsigned int c_count, |
115 | const struct GNUNET_CREDENTIAL_Delegate *cd, | 115 | const struct GNUNET_ABD_Delegate *cd, |
116 | size_t dest_size, | 116 | size_t dest_size, |
117 | char *dest); | 117 | char *dest); |
118 | 118 | ||
@@ -124,42 +124,42 @@ GNUNET_CREDENTIAL_delegation_chain_serialize ( | |||
124 | * @param src the serialized data | 124 | * @param src the serialized data |
125 | * @param d_count the number of delegation chain entries | 125 | * @param d_count the number of delegation chain entries |
126 | * @param dd where to put the delegation chain entries | 126 | * @param dd where to put the delegation chain entries |
127 | * @param c_count number of credential entries | 127 | * @param c_count number of abd entries |
128 | * @param cd where to put the credential data | 128 | * @param cd where to put the abd data |
129 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error | 129 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error |
130 | */ | 130 | */ |
131 | int | 131 | int |
132 | GNUNET_CREDENTIAL_delegation_chain_deserialize ( | 132 | GNUNET_ABD_delegation_chain_deserialize ( |
133 | size_t len, | 133 | size_t len, |
134 | const char *src, | 134 | const char *src, |
135 | unsigned int d_count, | 135 | unsigned int d_count, |
136 | struct GNUNET_CREDENTIAL_Delegation *dd, | 136 | struct GNUNET_ABD_Delegation *dd, |
137 | unsigned int c_count, | 137 | unsigned int c_count, |
138 | struct GNUNET_CREDENTIAL_Delegate *cd); | 138 | struct GNUNET_ABD_Delegate *cd); |
139 | size_t | 139 | size_t |
140 | GNUNET_CREDENTIAL_delegates_get_size ( | 140 | GNUNET_ABD_delegates_get_size ( |
141 | unsigned int c_count, | 141 | unsigned int c_count, |
142 | const struct GNUNET_CREDENTIAL_Delegate *cd); | 142 | const struct GNUNET_ABD_Delegate *cd); |
143 | 143 | ||
144 | ssize_t | 144 | ssize_t |
145 | GNUNET_CREDENTIAL_delegates_serialize ( | 145 | GNUNET_ABD_delegates_serialize ( |
146 | unsigned int c_count, | 146 | unsigned int c_count, |
147 | const struct GNUNET_CREDENTIAL_Delegate *cd, | 147 | const struct GNUNET_ABD_Delegate *cd, |
148 | size_t dest_size, | 148 | size_t dest_size, |
149 | char *dest); | 149 | char *dest); |
150 | 150 | ||
151 | 151 | ||
152 | int | 152 | int |
153 | GNUNET_CREDENTIAL_delegates_deserialize (size_t len, | 153 | GNUNET_ABD_delegates_deserialize (size_t len, |
154 | const char *src, | 154 | const char *src, |
155 | unsigned int c_count, | 155 | unsigned int c_count, |
156 | struct GNUNET_CREDENTIAL_Delegate *cd); | 156 | struct GNUNET_ABD_Delegate *cd); |
157 | 157 | ||
158 | int | 158 | int |
159 | GNUNET_CREDENTIAL_delegate_serialize (struct GNUNET_CREDENTIAL_Delegate *cred, | 159 | GNUNET_ABD_delegate_serialize (struct GNUNET_ABD_Delegate *cred, |
160 | char **data); | 160 | char **data); |
161 | 161 | ||
162 | struct GNUNET_CREDENTIAL_Delegate * | 162 | struct GNUNET_ABD_Delegate * |
163 | GNUNET_CREDENTIAL_delegate_deserialize (const char *data, size_t data_size); | 163 | GNUNET_ABD_delegate_deserialize (const char *data, size_t data_size); |
164 | #endif | 164 | #endif |
165 | /* end of credential_serialization.h */ | 165 | /* end of abd_serialization.h */ |
diff --git a/src/credential/delegate_misc.c b/src/abd/delegate_misc.c index 80124711a..ecc7f7669 100644 --- a/src/credential/delegate_misc.c +++ b/src/abd/delegate_misc.c | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | 21 | ||
22 | /** | 22 | /** |
23 | * @file credential/delegate_misc.c | 23 | * @file abd/delegate_misc.c |
24 | * @brief Misc API for delegate | 24 | * @brief Misc API for delegate |
25 | * | 25 | * |
26 | * @author Martin Schanzenbach | 26 | * @author Martin Schanzenbach |
@@ -28,14 +28,14 @@ | |||
28 | #include "platform.h" | 28 | #include "platform.h" |
29 | #include "gnunet_util_lib.h" | 29 | #include "gnunet_util_lib.h" |
30 | #include "gnunet_constants.h" | 30 | #include "gnunet_constants.h" |
31 | #include "gnunet_credential_service.h" | 31 | #include "gnunet_abd_service.h" |
32 | #include "gnunet_signatures.h" | 32 | #include "gnunet_signatures.h" |
33 | #include "credential.h" | 33 | #include "abd.h" |
34 | #include <inttypes.h> | 34 | #include <inttypes.h> |
35 | 35 | ||
36 | char * | 36 | char * |
37 | GNUNET_CREDENTIAL_delegate_to_string ( | 37 | GNUNET_ABD_delegate_to_string ( |
38 | const struct GNUNET_CREDENTIAL_Delegate *cred) | 38 | const struct GNUNET_ABD_Delegate *cred) |
39 | { | 39 | { |
40 | char *cred_str; | 40 | char *cred_str; |
41 | char *subject_pkey; | 41 | char *subject_pkey; |
@@ -75,10 +75,10 @@ GNUNET_CREDENTIAL_delegate_to_string ( | |||
75 | return cred_str; | 75 | return cred_str; |
76 | } | 76 | } |
77 | 77 | ||
78 | struct GNUNET_CREDENTIAL_Delegate * | 78 | struct GNUNET_ABD_Delegate * |
79 | GNUNET_CREDENTIAL_delegate_from_string (const char *s) | 79 | GNUNET_ABD_delegate_from_string (const char *s) |
80 | { | 80 | { |
81 | struct GNUNET_CREDENTIAL_Delegate *dele; | 81 | struct GNUNET_ABD_Delegate *dele; |
82 | size_t enclen = (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)) * 8; | 82 | size_t enclen = (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)) * 8; |
83 | if (enclen % 5 > 0) | 83 | if (enclen % 5 > 0) |
84 | enclen += 5 - enclen % 5; | 84 | enclen += 5 - enclen % 5; |
@@ -129,7 +129,7 @@ GNUNET_CREDENTIAL_delegate_from_string (const char *s) | |||
129 | { | 129 | { |
130 | attr_len = strlen (iss_attr) + strlen (sub_attr) + 2; | 130 | attr_len = strlen (iss_attr) + strlen (sub_attr) + 2; |
131 | } | 131 | } |
132 | dele = GNUNET_malloc (sizeof (struct GNUNET_CREDENTIAL_Delegate) + attr_len); | 132 | dele = GNUNET_malloc (sizeof (struct GNUNET_ABD_Delegate) + attr_len); |
133 | 133 | ||
134 | char tmp_str[attr_len]; | 134 | char tmp_str[attr_len]; |
135 | GNUNET_memcpy (tmp_str, iss_attr, strlen (iss_attr)); | 135 | GNUNET_memcpy (tmp_str, iss_attr, strlen (iss_attr)); |
@@ -183,8 +183,8 @@ GNUNET_CREDENTIAL_delegate_from_string (const char *s) | |||
183 | * @return handle to the queued request | 183 | * @return handle to the queued request |
184 | */ | 184 | */ |
185 | 185 | ||
186 | struct GNUNET_CREDENTIAL_Delegate * | 186 | struct GNUNET_ABD_Delegate * |
187 | GNUNET_CREDENTIAL_delegate_issue ( | 187 | GNUNET_ABD_delegate_issue ( |
188 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer, | 188 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer, |
189 | struct GNUNET_CRYPTO_EcdsaPublicKey *subject, | 189 | struct GNUNET_CRYPTO_EcdsaPublicKey *subject, |
190 | const char *iss_attr, | 190 | const char *iss_attr, |
@@ -192,7 +192,7 @@ GNUNET_CREDENTIAL_delegate_issue ( | |||
192 | struct GNUNET_TIME_Absolute *expiration) | 192 | struct GNUNET_TIME_Absolute *expiration) |
193 | { | 193 | { |
194 | struct DelegateEntry *del; | 194 | struct DelegateEntry *del; |
195 | struct GNUNET_CREDENTIAL_Delegate *dele; | 195 | struct GNUNET_ABD_Delegate *dele; |
196 | size_t size; | 196 | size_t size; |
197 | int attr_len; | 197 | int attr_len; |
198 | 198 | ||
@@ -246,7 +246,7 @@ GNUNET_CREDENTIAL_delegate_issue ( | |||
246 | return NULL; | 246 | return NULL; |
247 | } | 247 | } |
248 | 248 | ||
249 | dele = GNUNET_malloc (sizeof (struct GNUNET_CREDENTIAL_Delegate) + attr_len); | 249 | dele = GNUNET_malloc (sizeof (struct GNUNET_ABD_Delegate) + attr_len); |
250 | dele->signature = del->signature; | 250 | dele->signature = del->signature; |
251 | dele->expiration = *expiration; | 251 | dele->expiration = *expiration; |
252 | GNUNET_CRYPTO_ecdsa_key_get_public (issuer, &dele->issuer_key); | 252 | GNUNET_CRYPTO_ecdsa_key_get_public (issuer, &dele->issuer_key); |
diff --git a/src/credential/delegate_misc.h b/src/abd/delegate_misc.h index 936517437..42a95ce99 100644 --- a/src/credential/delegate_misc.h +++ b/src/abd/delegate_misc.h | |||
@@ -18,19 +18,19 @@ | |||
18 | SPDX-License-Identifier: AGPL3.0-or-later | 18 | SPDX-License-Identifier: AGPL3.0-or-later |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file credential/delegate_misc.h | 21 | * @file abd/delegate_misc.h |
22 | * @brief Delegate helper functions | 22 | * @brief Delegate helper functions |
23 | */ | 23 | */ |
24 | #ifndef DELEGATE_MISC_H | 24 | #ifndef DELEGATE_MISC_H |
25 | #define DELEGATE_MISC_H | 25 | #define DELEGATE_MISC_H |
26 | 26 | ||
27 | #include "gnunet_credential_service.h" | 27 | #include "gnunet_abd_service.h" |
28 | 28 | ||
29 | char * | 29 | char * |
30 | GNUNET_CREDENTIAL_delegate_to_string ( | 30 | GNUNET_ABD_delegate_to_string ( |
31 | const struct GNUNET_CREDENTIAL_Delegate *cred); | 31 | const struct GNUNET_ABD_Delegate *cred); |
32 | 32 | ||
33 | struct GNUNET_CREDENTIAL_Delegate * | 33 | struct GNUNET_ABD_Delegate * |
34 | GNUNET_CREDENTIAL_delegate_from_string (const char *str); | 34 | GNUNET_ABD_delegate_from_string (const char *str); |
35 | 35 | ||
36 | #endif | 36 | #endif |
diff --git a/src/credential/gnunet-credential.c b/src/abd/gnunet-abd.c index 03b017208..23083ec68 100644 --- a/src/credential/gnunet-credential.c +++ b/src/abd/gnunet-abd.c | |||
@@ -18,17 +18,17 @@ | |||
18 | SPDX-License-Identifier: AGPL3.0-or-later | 18 | SPDX-License-Identifier: AGPL3.0-or-later |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file gnunet-credential.c | 21 | * @file gnunet-abd.c |
22 | * @brief command line tool to access command line Credential service | 22 | * @brief command line tool to access command line Credential service |
23 | * @author Martin Schanzenbach | 23 | * @author Martin Schanzenbach |
24 | */ | 24 | */ |
25 | #include "platform.h" | 25 | #include "platform.h" |
26 | #include <gnunet_util_lib.h> | 26 | #include <gnunet_util_lib.h> |
27 | #include <gnunet_credential_service.h> | 27 | #include <gnunet_abd_service.h> |
28 | #include <gnunet_gnsrecord_lib.h> | 28 | #include <gnunet_gnsrecord_lib.h> |
29 | #include <gnunet_namestore_service.h> | 29 | #include <gnunet_namestore_service.h> |
30 | #include "delegate_misc.h" | 30 | #include "delegate_misc.h" |
31 | #include "credential_serialization.h" | 31 | #include "abd_serialization.h" |
32 | 32 | ||
33 | /** | 33 | /** |
34 | * Configuration we are using. | 34 | * Configuration we are using. |
@@ -53,7 +53,7 @@ static struct GNUNET_IDENTITY_EgoLookup *el; | |||
53 | /** | 53 | /** |
54 | * Handle to Credential service. | 54 | * Handle to Credential service. |
55 | */ | 55 | */ |
56 | static struct GNUNET_CREDENTIAL_Handle *credential; | 56 | static struct GNUNET_ABD_Handle *abd; |
57 | 57 | ||
58 | /** | 58 | /** |
59 | * Desired timeout for the lookup (default is no timeout). | 59 | * Desired timeout for the lookup (default is no timeout). |
@@ -63,12 +63,12 @@ static struct GNUNET_TIME_Relative timeout; | |||
63 | /** | 63 | /** |
64 | * Handle to verify request | 64 | * Handle to verify request |
65 | */ | 65 | */ |
66 | static struct GNUNET_CREDENTIAL_Request *verify_request; | 66 | static struct GNUNET_ABD_Request *verify_request; |
67 | 67 | ||
68 | /** | 68 | /** |
69 | * Handle to collect request | 69 | * Handle to collect request |
70 | */ | 70 | */ |
71 | static struct GNUNET_CREDENTIAL_Request *collect_request; | 71 | static struct GNUNET_ABD_Request *collect_request; |
72 | 72 | ||
73 | /** | 73 | /** |
74 | * Task scheduled to handle timeout. | 74 | * Task scheduled to handle timeout. |
@@ -169,7 +169,7 @@ static int backward; | |||
169 | /** | 169 | /** |
170 | * API enum, filled and passed for collect/verify | 170 | * API enum, filled and passed for collect/verify |
171 | */ | 171 | */ |
172 | enum GNUNET_CREDENTIAL_AlgoDirectionFlags direction = 0; | 172 | enum GNUNET_ABD_AlgoDirectionFlags direction = 0; |
173 | 173 | ||
174 | /** | 174 | /** |
175 | * Queue entry for the 'add' operation. | 175 | * Queue entry for the 'add' operation. |
@@ -225,13 +225,13 @@ do_shutdown (void *cls) | |||
225 | { | 225 | { |
226 | if (NULL != verify_request) | 226 | if (NULL != verify_request) |
227 | { | 227 | { |
228 | GNUNET_CREDENTIAL_request_cancel (verify_request); | 228 | GNUNET_ABD_request_cancel (verify_request); |
229 | verify_request = NULL; | 229 | verify_request = NULL; |
230 | } | 230 | } |
231 | if (NULL != credential) | 231 | if (NULL != abd) |
232 | { | 232 | { |
233 | GNUNET_CREDENTIAL_disconnect (credential); | 233 | GNUNET_ABD_disconnect (abd); |
234 | credential = NULL; | 234 | abd = NULL; |
235 | } | 235 | } |
236 | if (NULL != tt) | 236 | if (NULL != tt) |
237 | { | 237 | { |
@@ -270,7 +270,7 @@ do_timeout (void *cls) | |||
270 | 270 | ||
271 | static void | 271 | static void |
272 | handle_intermediate_result(void *cls, | 272 | handle_intermediate_result(void *cls, |
273 | struct GNUNET_CREDENTIAL_Delegation *dd, | 273 | struct GNUNET_ABD_Delegation *dd, |
274 | bool is_bw) | 274 | bool is_bw) |
275 | { | 275 | { |
276 | char *prefix = ""; | 276 | char *prefix = ""; |
@@ -290,9 +290,9 @@ handle_intermediate_result(void *cls, | |||
290 | static void | 290 | static void |
291 | handle_collect_result (void *cls, | 291 | handle_collect_result (void *cls, |
292 | unsigned int d_count, | 292 | unsigned int d_count, |
293 | struct GNUNET_CREDENTIAL_Delegation *dc, | 293 | struct GNUNET_ABD_Delegation *dc, |
294 | unsigned int c_count, | 294 | unsigned int c_count, |
295 | struct GNUNET_CREDENTIAL_Delegate *dele) | 295 | struct GNUNET_ABD_Delegate *dele) |
296 | { | 296 | { |
297 | int i; | 297 | int i; |
298 | char *line; | 298 | char *line; |
@@ -302,7 +302,7 @@ handle_collect_result (void *cls, | |||
302 | { | 302 | { |
303 | for (i = 0; i < c_count; i++) | 303 | for (i = 0; i < c_count; i++) |
304 | { | 304 | { |
305 | line = GNUNET_CREDENTIAL_delegate_to_string (&dele[i]); | 305 | line = GNUNET_ABD_delegate_to_string (&dele[i]); |
306 | printf ("%s\n", line); | 306 | printf ("%s\n", line); |
307 | GNUNET_free (line); | 307 | GNUNET_free (line); |
308 | } | 308 | } |
@@ -319,9 +319,9 @@ handle_collect_result (void *cls, | |||
319 | static void | 319 | static void |
320 | handle_verify_result (void *cls, | 320 | handle_verify_result (void *cls, |
321 | unsigned int d_count, | 321 | unsigned int d_count, |
322 | struct GNUNET_CREDENTIAL_Delegation *dc, | 322 | struct GNUNET_ABD_Delegation *dc, |
323 | unsigned int c_count, | 323 | unsigned int c_count, |
324 | struct GNUNET_CREDENTIAL_Delegate *dele) | 324 | struct GNUNET_ABD_Delegate *dele) |
325 | { | 325 | { |
326 | int i; | 326 | int i; |
327 | char *iss_key; | 327 | char *iss_key; |
@@ -413,7 +413,7 @@ identity_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego) | |||
413 | } | 413 | } |
414 | privkey = GNUNET_IDENTITY_ego_get_private_key (ego); | 414 | privkey = GNUNET_IDENTITY_ego_get_private_key (ego); |
415 | 415 | ||
416 | collect_request = GNUNET_CREDENTIAL_collect (credential, | 416 | collect_request = GNUNET_ABD_collect (abd, |
417 | &issuer_pkey, | 417 | &issuer_pkey, |
418 | issuer_attr, | 418 | issuer_attr, |
419 | privkey, | 419 | privkey, |
@@ -557,8 +557,8 @@ store_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego) | |||
557 | if (GNUNET_GNSRECORD_TYPE_DELEGATE == type) | 557 | if (GNUNET_GNSRECORD_TYPE_DELEGATE == type) |
558 | { | 558 | { |
559 | // Parse import | 559 | // Parse import |
560 | struct GNUNET_CREDENTIAL_Delegate *cred; | 560 | struct GNUNET_ABD_Delegate *cred; |
561 | cred = GNUNET_CREDENTIAL_delegate_from_string (import); | 561 | cred = GNUNET_ABD_delegate_from_string (import); |
562 | 562 | ||
563 | // Get import subject public key string | 563 | // Get import subject public key string |
564 | char *subject_pubkey_str = | 564 | char *subject_pubkey_str = |
@@ -584,7 +584,7 @@ store_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego) | |||
584 | etime_is_rel = GNUNET_NO; | 584 | etime_is_rel = GNUNET_NO; |
585 | 585 | ||
586 | // Prepare the data to be store in the record | 586 | // Prepare the data to be store in the record |
587 | data_size = GNUNET_CREDENTIAL_delegate_serialize (cred, (char **) &data); | 587 | data_size = GNUNET_ABD_delegate_serialize (cred, (char **) &data); |
588 | GNUNET_free (cred); | 588 | GNUNET_free (cred); |
589 | } | 589 | } |
590 | else | 590 | else |
@@ -631,7 +631,7 @@ static void | |||
631 | sign_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego) | 631 | sign_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego) |
632 | { | 632 | { |
633 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 633 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
634 | struct GNUNET_CREDENTIAL_Delegate *dele; | 634 | struct GNUNET_ABD_Delegate *dele; |
635 | struct GNUNET_TIME_Absolute etime_abs; | 635 | struct GNUNET_TIME_Absolute etime_abs; |
636 | char *res; | 636 | char *res; |
637 | 637 | ||
@@ -694,12 +694,12 @@ sign_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego) | |||
694 | } | 694 | } |
695 | 695 | ||
696 | // Sign delegate | 696 | // Sign delegate |
697 | dele = GNUNET_CREDENTIAL_delegate_issue (privkey, | 697 | dele = GNUNET_ABD_delegate_issue (privkey, |
698 | &subject_pkey, | 698 | &subject_pkey, |
699 | issuer_attr, | 699 | issuer_attr, |
700 | subject_attr, | 700 | subject_attr, |
701 | &etime_abs); | 701 | &etime_abs); |
702 | res = GNUNET_CREDENTIAL_delegate_to_string (dele); | 702 | res = GNUNET_ABD_delegate_to_string (dele); |
703 | GNUNET_free (dele); | 703 | GNUNET_free (dele); |
704 | printf ("%s\n", res); | 704 | printf ("%s\n", res); |
705 | 705 | ||
@@ -803,9 +803,9 @@ run (void *cls, | |||
803 | backward = GNUNET_YES; | 803 | backward = GNUNET_YES; |
804 | } | 804 | } |
805 | if (GNUNET_YES == forward) | 805 | if (GNUNET_YES == forward) |
806 | direction |= GNUNET_CREDENTIAL_FLAG_FORWARD; | 806 | direction |= GNUNET_ABD_FLAG_FORWARD; |
807 | if (GNUNET_YES == backward) | 807 | if (GNUNET_YES == backward) |
808 | direction |= GNUNET_CREDENTIAL_FLAG_BACKWARD; | 808 | direction |= GNUNET_ABD_FLAG_BACKWARD; |
809 | 809 | ||
810 | if (GNUNET_YES == collect) | 810 | if (GNUNET_YES == collect) |
811 | { | 811 | { |
@@ -816,11 +816,11 @@ run (void *cls, | |||
816 | return; | 816 | return; |
817 | } | 817 | } |
818 | 818 | ||
819 | credential = GNUNET_CREDENTIAL_connect (cfg); | 819 | abd = GNUNET_ABD_connect (cfg); |
820 | 820 | ||
821 | if (NULL == credential) | 821 | if (NULL == abd) |
822 | { | 822 | { |
823 | fprintf (stderr, _ ("Failed to connect to CREDENTIAL\n")); | 823 | fprintf (stderr, _ ("Failed to connect to ABD\n")); |
824 | GNUNET_SCHEDULER_shutdown (); | 824 | GNUNET_SCHEDULER_shutdown (); |
825 | return; | 825 | return; |
826 | } | 826 | } |
@@ -877,11 +877,11 @@ run (void *cls, | |||
877 | GNUNET_SCHEDULER_shutdown (); | 877 | GNUNET_SCHEDULER_shutdown (); |
878 | return; | 878 | return; |
879 | } | 879 | } |
880 | credential = GNUNET_CREDENTIAL_connect (cfg); | 880 | abd = GNUNET_ABD_connect (cfg); |
881 | 881 | ||
882 | if (NULL == credential) | 882 | if (NULL == abd) |
883 | { | 883 | { |
884 | fprintf (stderr, _ ("Failed to connect to CREDENTIAL\n")); | 884 | fprintf (stderr, _ ("Failed to connect to ABD\n")); |
885 | GNUNET_SCHEDULER_shutdown (); | 885 | GNUNET_SCHEDULER_shutdown (); |
886 | return; | 886 | return; |
887 | } | 887 | } |
@@ -906,23 +906,23 @@ run (void *cls, | |||
906 | int i; | 906 | int i; |
907 | while (NULL != (tok = strtok (NULL, ","))) | 907 | while (NULL != (tok = strtok (NULL, ","))) |
908 | count++; | 908 | count++; |
909 | struct GNUNET_CREDENTIAL_Delegate delegates[count]; | 909 | struct GNUNET_ABD_Delegate delegates[count]; |
910 | struct GNUNET_CREDENTIAL_Delegate *dele; | 910 | struct GNUNET_ABD_Delegate *dele; |
911 | GNUNET_free (tmp); | 911 | GNUNET_free (tmp); |
912 | tmp = GNUNET_strdup (subject_delegate); | 912 | tmp = GNUNET_strdup (subject_delegate); |
913 | tok = strtok (tmp, ","); | 913 | tok = strtok (tmp, ","); |
914 | for (i = 0; i < count; i++) | 914 | for (i = 0; i < count; i++) |
915 | { | 915 | { |
916 | dele = GNUNET_CREDENTIAL_delegate_from_string (tok); | 916 | dele = GNUNET_ABD_delegate_from_string (tok); |
917 | GNUNET_memcpy (&delegates[i], | 917 | GNUNET_memcpy (&delegates[i], |
918 | dele, | 918 | dele, |
919 | sizeof (struct GNUNET_CREDENTIAL_Delegate)); | 919 | sizeof (struct GNUNET_ABD_Delegate)); |
920 | delegates[i].issuer_attribute = GNUNET_strdup (dele->issuer_attribute); | 920 | delegates[i].issuer_attribute = GNUNET_strdup (dele->issuer_attribute); |
921 | tok = strtok (NULL, ","); | 921 | tok = strtok (NULL, ","); |
922 | GNUNET_free (dele); | 922 | GNUNET_free (dele); |
923 | } | 923 | } |
924 | 924 | ||
925 | verify_request = GNUNET_CREDENTIAL_verify (credential, | 925 | verify_request = GNUNET_ABD_verify (abd, |
926 | &issuer_pkey, | 926 | &issuer_pkey, |
927 | issuer_attr, | 927 | issuer_attr, |
928 | &subject_pkey, | 928 | &subject_pkey, |
@@ -1054,11 +1054,11 @@ main (int argc, char *const *argv) | |||
1054 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 1054 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) |
1055 | return 2; | 1055 | return 2; |
1056 | 1056 | ||
1057 | GNUNET_log_setup ("gnunet-credential", "WARNING", NULL); | 1057 | GNUNET_log_setup ("gnunet-abd", "WARNING", NULL); |
1058 | if (GNUNET_OK != GNUNET_PROGRAM_run (argc, | 1058 | if (GNUNET_OK != GNUNET_PROGRAM_run (argc, |
1059 | argv, | 1059 | argv, |
1060 | "gnunet-credential", | 1060 | "gnunet-abd", |
1061 | _ ("GNUnet credential resolver tool"), | 1061 | _ ("GNUnet abd resolver tool"), |
1062 | options, | 1062 | options, |
1063 | &run, | 1063 | &run, |
1064 | NULL)) | 1064 | NULL)) |
@@ -1067,4 +1067,4 @@ main (int argc, char *const *argv) | |||
1067 | return ret; | 1067 | return ret; |
1068 | } | 1068 | } |
1069 | 1069 | ||
1070 | /* end of gnunet-credential.c */ | 1070 | /* end of gnunet-abd.c */ |
diff --git a/src/credential/gnunet-service-credential.c b/src/abd/gnunet-service-abd.c index 4753e8e3b..84222b290 100644 --- a/src/credential/gnunet-service-credential.c +++ b/src/abd/gnunet-service-abd.c | |||
@@ -18,7 +18,7 @@ | |||
18 | SPDX-License-Identifier: AGPL3.0-or-later | 18 | SPDX-License-Identifier: AGPL3.0-or-later |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file credential/gnunet-service-credential.c | 21 | * @file abd/gnunet-service-abd.c |
22 | * @brief GNUnet Credential Service (main service) | 22 | * @brief GNUnet Credential Service (main service) |
23 | * @author Martin Schanzenbach | 23 | * @author Martin Schanzenbach |
24 | */ | 24 | */ |
@@ -26,9 +26,9 @@ | |||
26 | 26 | ||
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
28 | 28 | ||
29 | #include "credential.h" | 29 | #include "abd.h" |
30 | #include "credential_serialization.h" | 30 | #include "abd_serialization.h" |
31 | #include "gnunet_credential_service.h" | 31 | #include "gnunet_abd_service.h" |
32 | #include "gnunet_protocols.h" | 32 | #include "gnunet_protocols.h" |
33 | #include "gnunet_signatures.h" | 33 | #include "gnunet_signatures.h" |
34 | #include "gnunet_statistics_service.h" | 34 | #include "gnunet_statistics_service.h" |
@@ -39,7 +39,7 @@ | |||
39 | #include <gnunet_namestore_service.h> | 39 | #include <gnunet_namestore_service.h> |
40 | 40 | ||
41 | 41 | ||
42 | #define GNUNET_CREDENTIAL_MAX_LENGTH 255 | 42 | #define GNUNET_ABD_MAX_LENGTH 255 |
43 | 43 | ||
44 | struct VerifyRequestHandle; | 44 | struct VerifyRequestHandle; |
45 | 45 | ||
@@ -82,32 +82,6 @@ struct DelegationChainEntry | |||
82 | /** | 82 | /** |
83 | * DLL for record | 83 | * DLL for record |
84 | */ | 84 | */ |
85 | struct CredentialRecordEntry | ||
86 | { | ||
87 | /** | ||
88 | * DLL | ||
89 | */ | ||
90 | struct CredentialRecordEntry *next; | ||
91 | |||
92 | /** | ||
93 | * DLL | ||
94 | */ | ||
95 | struct CredentialRecordEntry *prev; | ||
96 | |||
97 | /** | ||
98 | * Number of references in delegation chains | ||
99 | */ | ||
100 | uint32_t refcount; | ||
101 | |||
102 | /** | ||
103 | * Payload | ||
104 | */ | ||
105 | struct GNUNET_CREDENTIAL_Credential *credential; | ||
106 | }; | ||
107 | |||
108 | /** | ||
109 | * DLL for record | ||
110 | */ | ||
111 | struct DelegateRecordEntry | 85 | struct DelegateRecordEntry |
112 | { | 86 | { |
113 | /** | 87 | /** |
@@ -128,7 +102,7 @@ struct DelegateRecordEntry | |||
128 | /** | 102 | /** |
129 | * Payload | 103 | * Payload |
130 | */ | 104 | */ |
131 | struct GNUNET_CREDENTIAL_Delegate *delegate; | 105 | struct GNUNET_ABD_Delegate *delegate; |
132 | }; | 106 | }; |
133 | 107 | ||
134 | /** | 108 | /** |
@@ -338,7 +312,7 @@ struct VerifyRequestHandle | |||
338 | /** | 312 | /** |
339 | * Direction of the resolution algo | 313 | * Direction of the resolution algo |
340 | */ | 314 | */ |
341 | enum GNUNET_CREDENTIAL_AlgoDirectionFlags resolution_algo; | 315 | enum GNUNET_ABD_AlgoDirectionFlags resolution_algo; |
342 | 316 | ||
343 | /** | 317 | /** |
344 | * Delegate iterator for lookup | 318 | * Delegate iterator for lookup |
@@ -463,7 +437,7 @@ shutdown_task (void *cls) | |||
463 | 437 | ||
464 | while (NULL != (vrh = vrh_head)) | 438 | while (NULL != (vrh = vrh_head)) |
465 | { | 439 | { |
466 | // CREDENTIAL_resolver_lookup_cancel (clh->lookup); | 440 | // ABD_resolver_lookup_cancel (clh->lookup); |
467 | GNUNET_CONTAINER_DLL_remove (vrh_head, vrh_tail, vrh); | 441 | GNUNET_CONTAINER_DLL_remove (vrh_head, vrh_tail, vrh); |
468 | cleanup_handle (vrh); | 442 | cleanup_handle (vrh); |
469 | } | 443 | } |
@@ -489,14 +463,14 @@ static void | |||
489 | send_intermediate_response(struct VerifyRequestHandle *vrh, struct DelegationChainEntry *ch_entry, bool is_bw){ | 463 | send_intermediate_response(struct VerifyRequestHandle *vrh, struct DelegationChainEntry *ch_entry, bool is_bw){ |
490 | struct DelegationChainIntermediateMessage *rmsg; | 464 | struct DelegationChainIntermediateMessage *rmsg; |
491 | struct GNUNET_MQ_Envelope *env; | 465 | struct GNUNET_MQ_Envelope *env; |
492 | struct GNUNET_CREDENTIAL_Delegation *dd; | 466 | struct GNUNET_ABD_Delegation *dd; |
493 | size_t size; | 467 | size_t size; |
494 | 468 | ||
495 | // Don't report immediate results during collect | 469 | // Don't report immediate results during collect |
496 | if(vrh->is_collect) | 470 | if(vrh->is_collect) |
497 | return; | 471 | return; |
498 | 472 | ||
499 | dd = GNUNET_new (struct GNUNET_CREDENTIAL_Delegation); | 473 | dd = GNUNET_new (struct GNUNET_ABD_Delegation); |
500 | dd->issuer_key = ch_entry->issuer_key; | 474 | dd->issuer_key = ch_entry->issuer_key; |
501 | dd->subject_key = ch_entry->subject_key; | 475 | dd->subject_key = ch_entry->subject_key; |
502 | dd->issuer_attribute = ch_entry->issuer_attribute; | 476 | dd->issuer_attribute = ch_entry->issuer_attribute; |
@@ -510,21 +484,21 @@ send_intermediate_response(struct VerifyRequestHandle *vrh, struct DelegationCha | |||
510 | } | 484 | } |
511 | 485 | ||
512 | 486 | ||
513 | size = GNUNET_CREDENTIAL_delegation_chain_get_size (1, | 487 | size = GNUNET_ABD_delegation_chain_get_size (1, |
514 | dd, | 488 | dd, |
515 | 0, | 489 | 0, |
516 | NULL); | 490 | NULL); |
517 | 491 | ||
518 | env = GNUNET_MQ_msg_extra (rmsg, | 492 | env = GNUNET_MQ_msg_extra (rmsg, |
519 | size, | 493 | size, |
520 | GNUNET_MESSAGE_TYPE_CREDENTIAL_INTERMEDIATE_RESULT); | 494 | GNUNET_MESSAGE_TYPE_ABD_INTERMEDIATE_RESULT); |
521 | // Assign id so that client can find associated request | 495 | // Assign id so that client can find associated request |
522 | rmsg->id = vrh->request_id; | 496 | rmsg->id = vrh->request_id; |
523 | rmsg->is_bw = htons(is_bw); | 497 | rmsg->is_bw = htons(is_bw); |
524 | rmsg->size = htonl(size); | 498 | rmsg->size = htonl(size); |
525 | 499 | ||
526 | GNUNET_assert ( | 500 | GNUNET_assert ( |
527 | -1 != GNUNET_CREDENTIAL_delegation_chain_serialize (1, | 501 | -1 != GNUNET_ABD_delegation_chain_serialize (1, |
528 | dd, | 502 | dd, |
529 | 0, | 503 | 0, |
530 | NULL, | 504 | NULL, |
@@ -539,8 +513,8 @@ send_lookup_response (struct VerifyRequestHandle *vrh) | |||
539 | struct GNUNET_MQ_Envelope *env; | 513 | struct GNUNET_MQ_Envelope *env; |
540 | struct DelegationChainResultMessage *rmsg; | 514 | struct DelegationChainResultMessage *rmsg; |
541 | struct DelegationChainEntry *dce; | 515 | struct DelegationChainEntry *dce; |
542 | struct GNUNET_CREDENTIAL_Delegation dd[vrh->delegation_chain_size]; | 516 | struct GNUNET_ABD_Delegation dd[vrh->delegation_chain_size]; |
543 | struct GNUNET_CREDENTIAL_Delegate dele[vrh->del_chain_size]; | 517 | struct GNUNET_ABD_Delegate dele[vrh->del_chain_size]; |
544 | struct DelegateRecordEntry *del; | 518 | struct DelegateRecordEntry *del; |
545 | struct DelegateRecordEntry *tmp; | 519 | struct DelegateRecordEntry *tmp; |
546 | size_t size; | 520 | size_t size; |
@@ -595,13 +569,13 @@ send_lookup_response (struct VerifyRequestHandle *vrh) | |||
595 | del = del->next; | 569 | del = del->next; |
596 | } | 570 | } |
597 | size = | 571 | size = |
598 | GNUNET_CREDENTIAL_delegation_chain_get_size (vrh->delegation_chain_size, | 572 | GNUNET_ABD_delegation_chain_get_size (vrh->delegation_chain_size, |
599 | dd, | 573 | dd, |
600 | vrh->del_chain_size, | 574 | vrh->del_chain_size, |
601 | dele); | 575 | dele); |
602 | env = GNUNET_MQ_msg_extra (rmsg, | 576 | env = GNUNET_MQ_msg_extra (rmsg, |
603 | size, | 577 | size, |
604 | GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY_RESULT); | 578 | GNUNET_MESSAGE_TYPE_ABD_VERIFY_RESULT); |
605 | // Assign id so that client can find associated request | 579 | // Assign id so that client can find associated request |
606 | rmsg->id = vrh->request_id; | 580 | rmsg->id = vrh->request_id; |
607 | rmsg->d_count = htonl (vrh->delegation_chain_size); | 581 | rmsg->d_count = htonl (vrh->delegation_chain_size); |
@@ -614,7 +588,7 @@ send_lookup_response (struct VerifyRequestHandle *vrh) | |||
614 | 588 | ||
615 | GNUNET_assert ( | 589 | GNUNET_assert ( |
616 | -1 != | 590 | -1 != |
617 | GNUNET_CREDENTIAL_delegation_chain_serialize (vrh->delegation_chain_size, | 591 | GNUNET_ABD_delegation_chain_serialize (vrh->delegation_chain_size, |
618 | dd, | 592 | dd, |
619 | vrh->del_chain_size, | 593 | vrh->del_chain_size, |
620 | dele, | 594 | dele, |
@@ -775,8 +749,8 @@ forward_resolution (void *cls, | |||
775 | continue; | 749 | continue; |
776 | 750 | ||
777 | // Start deserialize into Delegate | 751 | // Start deserialize into Delegate |
778 | struct GNUNET_CREDENTIAL_Delegate *del; | 752 | struct GNUNET_ABD_Delegate *del; |
779 | del = GNUNET_CREDENTIAL_delegate_deserialize (rd[i].data, rd[i].data_size); | 753 | del = GNUNET_ABD_delegate_deserialize (rd[i].data, rd[i].data_size); |
780 | 754 | ||
781 | // Start: Create DQ Entry | 755 | // Start: Create DQ Entry |
782 | dq_entry = GNUNET_new (struct DelegationQueueEntry); | 756 | dq_entry = GNUNET_new (struct DelegationQueueEntry); |
@@ -996,7 +970,7 @@ backward_resolution (void *cls, | |||
996 | const struct GNUNET_GNSRECORD_Data *rd) | 970 | const struct GNUNET_GNSRECORD_Data *rd) |
997 | { | 971 | { |
998 | struct VerifyRequestHandle *vrh; | 972 | struct VerifyRequestHandle *vrh; |
999 | const struct GNUNET_CREDENTIAL_DelegationRecord *sets; | 973 | const struct GNUNET_ABD_DelegationRecord *sets; |
1000 | struct DelegateRecordEntry *del_pointer; | 974 | struct DelegateRecordEntry *del_pointer; |
1001 | struct DelegationSetQueueEntry *current_set; | 975 | struct DelegationSetQueueEntry *current_set; |
1002 | struct DelegationSetQueueEntry *ds_entry; | 976 | struct DelegationSetQueueEntry *ds_entry; |
@@ -1017,13 +991,13 @@ backward_resolution (void *cls, | |||
1017 | continue; | 991 | continue; |
1018 | 992 | ||
1019 | sets = rd[i].data; | 993 | sets = rd[i].data; |
1020 | struct GNUNET_CREDENTIAL_DelegationSet set[ntohl (sets->set_count)]; | 994 | struct GNUNET_ABD_DelegationSet set[ntohl (sets->set_count)]; |
1021 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 995 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1022 | "Found new attribute delegation with %d sets. Creating new Job...\n", | 996 | "Found new attribute delegation with %d sets. Creating new Job...\n", |
1023 | ntohl (sets->set_count)); | 997 | ntohl (sets->set_count)); |
1024 | 998 | ||
1025 | if (GNUNET_OK != | 999 | if (GNUNET_OK != |
1026 | GNUNET_CREDENTIAL_delegation_set_deserialize (GNUNET_ntohll ( | 1000 | GNUNET_ABD_delegation_set_deserialize (GNUNET_ntohll ( |
1027 | sets->data_size), | 1001 | sets->data_size), |
1028 | (const char *) &sets[1], | 1002 | (const char *) &sets[1], |
1029 | ntohl (sets->set_count), | 1003 | ntohl (sets->set_count), |
@@ -1430,14 +1404,14 @@ check_verify (void *cls, const struct VerifyMessage *v_msg) | |||
1430 | GNUNET_break (0); | 1404 | GNUNET_break (0); |
1431 | return GNUNET_SYSERR; | 1405 | return GNUNET_SYSERR; |
1432 | } | 1406 | } |
1433 | if (ntohs (v_msg->issuer_attribute_len) > GNUNET_CREDENTIAL_MAX_LENGTH) | 1407 | if (ntohs (v_msg->issuer_attribute_len) > GNUNET_ABD_MAX_LENGTH) |
1434 | { | 1408 | { |
1435 | GNUNET_break (0); | 1409 | GNUNET_break (0); |
1436 | return GNUNET_SYSERR; | 1410 | return GNUNET_SYSERR; |
1437 | } | 1411 | } |
1438 | attr = (const char *) &v_msg[1]; | 1412 | attr = (const char *) &v_msg[1]; |
1439 | 1413 | ||
1440 | if (strlen (attr) > GNUNET_CREDENTIAL_MAX_LENGTH) | 1414 | if (strlen (attr) > GNUNET_ABD_MAX_LENGTH) |
1441 | { | 1415 | { |
1442 | GNUNET_break (0); | 1416 | GNUNET_break (0); |
1443 | return GNUNET_SYSERR; | 1417 | return GNUNET_SYSERR; |
@@ -1453,8 +1427,8 @@ handle_verify (void *cls, const struct VerifyMessage *v_msg) | |||
1453 | struct DelegateRecordEntry *del_entry; | 1427 | struct DelegateRecordEntry *del_entry; |
1454 | uint32_t delegate_count; | 1428 | uint32_t delegate_count; |
1455 | uint32_t delegate_data_size; | 1429 | uint32_t delegate_data_size; |
1456 | char attr[GNUNET_CREDENTIAL_MAX_LENGTH + 1]; | 1430 | char attr[GNUNET_ABD_MAX_LENGTH + 1]; |
1457 | char issuer_attribute[GNUNET_CREDENTIAL_MAX_LENGTH + 1]; | 1431 | char issuer_attribute[GNUNET_ABD_MAX_LENGTH + 1]; |
1458 | char *attrptr = attr; | 1432 | char *attrptr = attr; |
1459 | char *delegate_data; | 1433 | char *delegate_data; |
1460 | const char *utf_in; | 1434 | const char *utf_in; |
@@ -1494,12 +1468,12 @@ handle_verify (void *cls, const struct VerifyMessage *v_msg) | |||
1494 | delegate_data_size = ntohs (v_msg->header.size) - | 1468 | delegate_data_size = ntohs (v_msg->header.size) - |
1495 | sizeof (struct VerifyMessage) - | 1469 | sizeof (struct VerifyMessage) - |
1496 | ntohs (v_msg->issuer_attribute_len) - 1; | 1470 | ntohs (v_msg->issuer_attribute_len) - 1; |
1497 | struct GNUNET_CREDENTIAL_Delegate delegates[delegate_count]; | 1471 | struct GNUNET_ABD_Delegate delegates[delegate_count]; |
1498 | memset (delegates, | 1472 | memset (delegates, |
1499 | 0, | 1473 | 0, |
1500 | sizeof (struct GNUNET_CREDENTIAL_Delegate) * delegate_count); | 1474 | sizeof (struct GNUNET_ABD_Delegate) * delegate_count); |
1501 | delegate_data = (char *) &v_msg[1] + ntohs (v_msg->issuer_attribute_len) + 1; | 1475 | delegate_data = (char *) &v_msg[1] + ntohs (v_msg->issuer_attribute_len) + 1; |
1502 | if (GNUNET_OK != GNUNET_CREDENTIAL_delegates_deserialize (delegate_data_size, | 1476 | if (GNUNET_OK != GNUNET_ABD_delegates_deserialize (delegate_data_size, |
1503 | delegate_data, | 1477 | delegate_data, |
1504 | delegate_count, | 1478 | delegate_count, |
1505 | delegates)) | 1479 | delegates)) |
@@ -1514,11 +1488,11 @@ handle_verify (void *cls, const struct VerifyMessage *v_msg) | |||
1514 | { | 1488 | { |
1515 | del_entry = GNUNET_new (struct DelegateRecordEntry); | 1489 | del_entry = GNUNET_new (struct DelegateRecordEntry); |
1516 | del_entry->delegate = | 1490 | del_entry->delegate = |
1517 | GNUNET_malloc (sizeof (struct GNUNET_CREDENTIAL_Delegate) + | 1491 | GNUNET_malloc (sizeof (struct GNUNET_ABD_Delegate) + |
1518 | delegates[i].issuer_attribute_len + 1); | 1492 | delegates[i].issuer_attribute_len + 1); |
1519 | GNUNET_memcpy (del_entry->delegate, | 1493 | GNUNET_memcpy (del_entry->delegate, |
1520 | &delegates[i], | 1494 | &delegates[i], |
1521 | sizeof (struct GNUNET_CREDENTIAL_Delegate)); | 1495 | sizeof (struct GNUNET_ABD_Delegate)); |
1522 | GNUNET_memcpy (&del_entry->delegate[1], | 1496 | GNUNET_memcpy (&del_entry->delegate[1], |
1523 | delegates[i].issuer_attribute, | 1497 | delegates[i].issuer_attribute, |
1524 | delegates[i].issuer_attribute_len); | 1498 | delegates[i].issuer_attribute_len); |
@@ -1532,18 +1506,18 @@ handle_verify (void *cls, const struct VerifyMessage *v_msg) | |||
1532 | } | 1506 | } |
1533 | 1507 | ||
1534 | // Switch resolution algo | 1508 | // Switch resolution algo |
1535 | if (GNUNET_CREDENTIAL_FLAG_BACKWARD & vrh->resolution_algo && | 1509 | if (GNUNET_ABD_FLAG_BACKWARD & vrh->resolution_algo && |
1536 | GNUNET_CREDENTIAL_FLAG_FORWARD & vrh->resolution_algo) | 1510 | GNUNET_ABD_FLAG_FORWARD & vrh->resolution_algo) |
1537 | { | 1511 | { |
1538 | if(1 == delegation_chain_fw_resolution_start (vrh)) | 1512 | if(1 == delegation_chain_fw_resolution_start (vrh)) |
1539 | return; | 1513 | return; |
1540 | delegation_chain_bw_resolution_start (vrh); | 1514 | delegation_chain_bw_resolution_start (vrh); |
1541 | } | 1515 | } |
1542 | else if (GNUNET_CREDENTIAL_FLAG_BACKWARD & vrh->resolution_algo) | 1516 | else if (GNUNET_ABD_FLAG_BACKWARD & vrh->resolution_algo) |
1543 | { | 1517 | { |
1544 | delegation_chain_bw_resolution_start (vrh); | 1518 | delegation_chain_bw_resolution_start (vrh); |
1545 | } | 1519 | } |
1546 | else if (GNUNET_CREDENTIAL_FLAG_FORWARD & vrh->resolution_algo) | 1520 | else if (GNUNET_ABD_FLAG_FORWARD & vrh->resolution_algo) |
1547 | { | 1521 | { |
1548 | delegation_chain_fw_resolution_start (vrh); | 1522 | delegation_chain_fw_resolution_start (vrh); |
1549 | } | 1523 | } |
@@ -1566,19 +1540,19 @@ delegate_collection_finished (void *cls) | |||
1566 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Done collecting delegates.\n"); | 1540 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Done collecting delegates.\n"); |
1567 | 1541 | ||
1568 | // if both are set: bidirectional search, meaning start both chain resolutions | 1542 | // if both are set: bidirectional search, meaning start both chain resolutions |
1569 | if (GNUNET_CREDENTIAL_FLAG_BACKWARD & vrh->resolution_algo && | 1543 | if (GNUNET_ABD_FLAG_BACKWARD & vrh->resolution_algo && |
1570 | GNUNET_CREDENTIAL_FLAG_FORWARD & vrh->resolution_algo) | 1544 | GNUNET_ABD_FLAG_FORWARD & vrh->resolution_algo) |
1571 | { | 1545 | { |
1572 | // if premature match found don't start bw resultion | 1546 | // if premature match found don't start bw resultion |
1573 | if(1 == delegation_chain_fw_resolution_start (vrh)) | 1547 | if(1 == delegation_chain_fw_resolution_start (vrh)) |
1574 | return; | 1548 | return; |
1575 | delegation_chain_bw_resolution_start (vrh); | 1549 | delegation_chain_bw_resolution_start (vrh); |
1576 | } | 1550 | } |
1577 | else if (GNUNET_CREDENTIAL_FLAG_BACKWARD & vrh->resolution_algo) | 1551 | else if (GNUNET_ABD_FLAG_BACKWARD & vrh->resolution_algo) |
1578 | { | 1552 | { |
1579 | delegation_chain_bw_resolution_start (vrh); | 1553 | delegation_chain_bw_resolution_start (vrh); |
1580 | } | 1554 | } |
1581 | else if (GNUNET_CREDENTIAL_FLAG_FORWARD & vrh->resolution_algo) | 1555 | else if (GNUNET_ABD_FLAG_FORWARD & vrh->resolution_algo) |
1582 | { | 1556 | { |
1583 | delegation_chain_fw_resolution_start (vrh); | 1557 | delegation_chain_fw_resolution_start (vrh); |
1584 | } | 1558 | } |
@@ -1592,7 +1566,7 @@ handle_delegate_collection_cb (void *cls, | |||
1592 | const struct GNUNET_GNSRECORD_Data *rd) | 1566 | const struct GNUNET_GNSRECORD_Data *rd) |
1593 | { | 1567 | { |
1594 | struct VerifyRequestHandle *vrh = cls; | 1568 | struct VerifyRequestHandle *vrh = cls; |
1595 | struct GNUNET_CREDENTIAL_Delegate *del; | 1569 | struct GNUNET_ABD_Delegate *del; |
1596 | struct DelegateRecordEntry *del_entry; | 1570 | struct DelegateRecordEntry *del_entry; |
1597 | int cred_record_count; | 1571 | int cred_record_count; |
1598 | cred_record_count = 0; | 1572 | cred_record_count = 0; |
@@ -1603,7 +1577,7 @@ handle_delegate_collection_cb (void *cls, | |||
1603 | if (GNUNET_GNSRECORD_TYPE_DELEGATE != rd[i].record_type) | 1577 | if (GNUNET_GNSRECORD_TYPE_DELEGATE != rd[i].record_type) |
1604 | continue; | 1578 | continue; |
1605 | cred_record_count++; | 1579 | cred_record_count++; |
1606 | del = GNUNET_CREDENTIAL_delegate_deserialize (rd[i].data, rd[i].data_size); | 1580 | del = GNUNET_ABD_delegate_deserialize (rd[i].data, rd[i].data_size); |
1607 | if (NULL == del) | 1581 | if (NULL == del) |
1608 | { | 1582 | { |
1609 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid delegate found\n"); | 1583 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid delegate found\n"); |
@@ -1628,8 +1602,8 @@ handle_delegate_collection_cb (void *cls, | |||
1628 | static void | 1602 | static void |
1629 | handle_collect (void *cls, const struct CollectMessage *c_msg) | 1603 | handle_collect (void *cls, const struct CollectMessage *c_msg) |
1630 | { | 1604 | { |
1631 | char attr[GNUNET_CREDENTIAL_MAX_LENGTH + 1]; | 1605 | char attr[GNUNET_ABD_MAX_LENGTH + 1]; |
1632 | char issuer_attribute[GNUNET_CREDENTIAL_MAX_LENGTH + 1]; | 1606 | char issuer_attribute[GNUNET_ABD_MAX_LENGTH + 1]; |
1633 | struct VerifyRequestHandle *vrh; | 1607 | struct VerifyRequestHandle *vrh; |
1634 | struct GNUNET_SERVICE_Client *client = cls; | 1608 | struct GNUNET_SERVICE_Client *client = cls; |
1635 | char *attrptr = attr; | 1609 | char *attrptr = attr; |
@@ -1692,7 +1666,7 @@ check_collect (void *cls, const struct CollectMessage *c_msg) | |||
1692 | GNUNET_break (0); | 1666 | GNUNET_break (0); |
1693 | return GNUNET_SYSERR; | 1667 | return GNUNET_SYSERR; |
1694 | } | 1668 | } |
1695 | if (ntohs (c_msg->issuer_attribute_len) > GNUNET_CREDENTIAL_MAX_LENGTH) | 1669 | if (ntohs (c_msg->issuer_attribute_len) > GNUNET_ABD_MAX_LENGTH) |
1696 | { | 1670 | { |
1697 | GNUNET_break (0); | 1671 | GNUNET_break (0); |
1698 | return GNUNET_SYSERR; | 1672 | return GNUNET_SYSERR; |
@@ -1700,7 +1674,7 @@ check_collect (void *cls, const struct CollectMessage *c_msg) | |||
1700 | attr = (const char *) &c_msg[1]; | 1674 | attr = (const char *) &c_msg[1]; |
1701 | 1675 | ||
1702 | if (('\0' != attr[msg_size - sizeof (struct CollectMessage) - 1]) || | 1676 | if (('\0' != attr[msg_size - sizeof (struct CollectMessage) - 1]) || |
1703 | (strlen (attr) > GNUNET_CREDENTIAL_MAX_LENGTH)) | 1677 | (strlen (attr) > GNUNET_ABD_MAX_LENGTH)) |
1704 | { | 1678 | { |
1705 | GNUNET_break (0); | 1679 | GNUNET_break (0); |
1706 | return GNUNET_SYSERR; | 1680 | return GNUNET_SYSERR; |
@@ -1749,7 +1723,7 @@ run (void *cls, | |||
1749 | fprintf (stderr, _ ("Failed to connect to namestore\n")); | 1723 | fprintf (stderr, _ ("Failed to connect to namestore\n")); |
1750 | } | 1724 | } |
1751 | 1725 | ||
1752 | statistics = GNUNET_STATISTICS_create ("credential", c); | 1726 | statistics = GNUNET_STATISTICS_create ("abd", c); |
1753 | GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); | 1727 | GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); |
1754 | } | 1728 | } |
1755 | 1729 | ||
@@ -1758,20 +1732,20 @@ run (void *cls, | |||
1758 | * Define "main" method using service macro | 1732 | * Define "main" method using service macro |
1759 | */ | 1733 | */ |
1760 | GNUNET_SERVICE_MAIN ( | 1734 | GNUNET_SERVICE_MAIN ( |
1761 | "credential", | 1735 | "abd", |
1762 | GNUNET_SERVICE_OPTION_NONE, | 1736 | GNUNET_SERVICE_OPTION_NONE, |
1763 | &run, | 1737 | &run, |
1764 | &client_connect_cb, | 1738 | &client_connect_cb, |
1765 | &client_disconnect_cb, | 1739 | &client_disconnect_cb, |
1766 | NULL, | 1740 | NULL, |
1767 | GNUNET_MQ_hd_var_size (verify, | 1741 | GNUNET_MQ_hd_var_size (verify, |
1768 | GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY, | 1742 | GNUNET_MESSAGE_TYPE_ABD_VERIFY, |
1769 | struct VerifyMessage, | 1743 | struct VerifyMessage, |
1770 | NULL), | 1744 | NULL), |
1771 | GNUNET_MQ_hd_var_size (collect, | 1745 | GNUNET_MQ_hd_var_size (collect, |
1772 | GNUNET_MESSAGE_TYPE_CREDENTIAL_COLLECT, | 1746 | GNUNET_MESSAGE_TYPE_ABD_COLLECT, |
1773 | struct CollectMessage, | 1747 | struct CollectMessage, |
1774 | NULL), | 1748 | NULL), |
1775 | GNUNET_MQ_handler_end ()); | 1749 | GNUNET_MQ_handler_end ()); |
1776 | 1750 | ||
1777 | /* end of gnunet-service-credential.c */ | 1751 | /* end of gnunet-service-abd.c */ |
diff --git a/src/credential/plugin_gnsrecord_credential.c b/src/abd/plugin_gnsrecord_abd.c index 088c4dd0e..811878627 100644 --- a/src/credential/plugin_gnsrecord_credential.c +++ b/src/abd/plugin_gnsrecord_abd.c | |||
@@ -19,8 +19,8 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file credential/plugin_gnsrecord_credential.c | 22 | * @file abd/plugin_gnsrecord_abd.c |
23 | * @brief gnsrecord plugin to provide the API for CREDENTIAL records | 23 | * @brief gnsrecord plugin to provide the API for ABD records |
24 | * @author Martin Schanzenbach | 24 | * @author Martin Schanzenbach |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
@@ -28,8 +28,8 @@ | |||
28 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
29 | 29 | ||
30 | #include "delegate_misc.h" | 30 | #include "delegate_misc.h" |
31 | #include "credential_serialization.h" | 31 | #include "abd_serialization.h" |
32 | #include "gnunet_credential_service.h" | 32 | #include "gnunet_abd_service.h" |
33 | #include "gnunet_gnsrecord_lib.h" | 33 | #include "gnunet_gnsrecord_lib.h" |
34 | #include "gnunet_gnsrecord_plugin.h" | 34 | #include "gnunet_gnsrecord_plugin.h" |
35 | #include "gnunet_signatures.h" | 35 | #include "gnunet_signatures.h" |
@@ -43,7 +43,7 @@ | |||
43 | * @return NULL on error, otherwise human-readable representation of the value | 43 | * @return NULL on error, otherwise human-readable representation of the value |
44 | */ | 44 | */ |
45 | static char * | 45 | static char * |
46 | credential_value_to_string (void *cls, | 46 | abd_value_to_string (void *cls, |
47 | uint32_t type, | 47 | uint32_t type, |
48 | const void *data, | 48 | const void *data, |
49 | size_t data_size) | 49 | size_t data_size) |
@@ -54,20 +54,20 @@ credential_value_to_string (void *cls, | |||
54 | { | 54 | { |
55 | case GNUNET_GNSRECORD_TYPE_ATTRIBUTE: | 55 | case GNUNET_GNSRECORD_TYPE_ATTRIBUTE: |
56 | { | 56 | { |
57 | struct GNUNET_CREDENTIAL_DelegationRecord sets; | 57 | struct GNUNET_ABD_DelegationRecord sets; |
58 | char *attr_str; | 58 | char *attr_str; |
59 | char *subject_pkey; | 59 | char *subject_pkey; |
60 | char *tmp_str; | 60 | char *tmp_str; |
61 | int i; | 61 | int i; |
62 | if (data_size < sizeof (struct GNUNET_CREDENTIAL_DelegationRecord)) | 62 | if (data_size < sizeof (struct GNUNET_ABD_DelegationRecord)) |
63 | return NULL; /* malformed */ | 63 | return NULL; /* malformed */ |
64 | 64 | ||
65 | GNUNET_memcpy (&sets, data, sizeof (sets)); | 65 | GNUNET_memcpy (&sets, data, sizeof (sets)); |
66 | cdata = data; | 66 | cdata = data; |
67 | 67 | ||
68 | struct GNUNET_CREDENTIAL_DelegationSet set[ntohl (sets.set_count)]; | 68 | struct GNUNET_ABD_DelegationSet set[ntohl (sets.set_count)]; |
69 | if (GNUNET_OK != | 69 | if (GNUNET_OK != |
70 | GNUNET_CREDENTIAL_delegation_set_deserialize (GNUNET_ntohll ( | 70 | GNUNET_ABD_delegation_set_deserialize (GNUNET_ntohll ( |
71 | sets.data_size), | 71 | sets.data_size), |
72 | &cdata[sizeof (sets)], | 72 | &cdata[sizeof (sets)], |
73 | ntohl (sets.set_count), | 73 | ntohl (sets.set_count), |
@@ -118,11 +118,11 @@ credential_value_to_string (void *cls, | |||
118 | } | 118 | } |
119 | case GNUNET_GNSRECORD_TYPE_DELEGATE: | 119 | case GNUNET_GNSRECORD_TYPE_DELEGATE: |
120 | { | 120 | { |
121 | struct GNUNET_CREDENTIAL_Delegate *cred; | 121 | struct GNUNET_ABD_Delegate *cred; |
122 | char *cred_str; | 122 | char *cred_str; |
123 | 123 | ||
124 | cred = GNUNET_CREDENTIAL_delegate_deserialize (data, data_size); | 124 | cred = GNUNET_ABD_delegate_deserialize (data, data_size); |
125 | cred_str = GNUNET_CREDENTIAL_delegate_to_string (cred); | 125 | cred_str = GNUNET_ABD_delegate_to_string (cred); |
126 | GNUNET_free (cred); | 126 | GNUNET_free (cred); |
127 | return cred_str; | 127 | return cred_str; |
128 | } | 128 | } |
@@ -144,7 +144,7 @@ credential_value_to_string (void *cls, | |||
144 | * @return #GNUNET_OK on success | 144 | * @return #GNUNET_OK on success |
145 | */ | 145 | */ |
146 | static int | 146 | static int |
147 | credential_string_to_value (void *cls, | 147 | abd_string_to_value (void *cls, |
148 | uint32_t type, | 148 | uint32_t type, |
149 | const char *s, | 149 | const char *s, |
150 | void **data, | 150 | void **data, |
@@ -156,7 +156,7 @@ credential_string_to_value (void *cls, | |||
156 | { | 156 | { |
157 | case GNUNET_GNSRECORD_TYPE_ATTRIBUTE: | 157 | case GNUNET_GNSRECORD_TYPE_ATTRIBUTE: |
158 | { | 158 | { |
159 | struct GNUNET_CREDENTIAL_DelegationRecord *sets; | 159 | struct GNUNET_ABD_DelegationRecord *sets; |
160 | char attr_str[253 + 1]; | 160 | char attr_str[253 + 1]; |
161 | char subject_pkey[52 + 1]; | 161 | char subject_pkey[52 + 1]; |
162 | char *token; | 162 | char *token; |
@@ -170,7 +170,7 @@ credential_string_to_value (void *cls, | |||
170 | token = strtok (tmp_str, ","); | 170 | token = strtok (tmp_str, ","); |
171 | entries = 0; | 171 | entries = 0; |
172 | tmp_data_size = 0; | 172 | tmp_data_size = 0; |
173 | *data_size = sizeof (struct GNUNET_CREDENTIAL_DelegationRecord); | 173 | *data_size = sizeof (struct GNUNET_ABD_DelegationRecord); |
174 | while (NULL != token) | 174 | while (NULL != token) |
175 | { | 175 | { |
176 | // also fills the variables subject_pley and attr_str if "regex"-like match | 176 | // also fills the variables subject_pley and attr_str if "regex"-like match |
@@ -199,9 +199,9 @@ credential_string_to_value (void *cls, | |||
199 | return GNUNET_SYSERR; | 199 | return GNUNET_SYSERR; |
200 | } | 200 | } |
201 | 201 | ||
202 | struct GNUNET_CREDENTIAL_DelegationSet set[entries]; | 202 | struct GNUNET_ABD_DelegationSet set[entries]; |
203 | // sets memory to be 0, starting at *set for the size of struct * entries | 203 | // sets memory to be 0, starting at *set for the size of struct * entries |
204 | memset (set, 0, sizeof (struct GNUNET_CREDENTIAL_DelegationSet) * entries); | 204 | memset (set, 0, sizeof (struct GNUNET_ABD_DelegationSet) * entries); |
205 | for (i = 0; i < entries; i++) | 205 | for (i = 0; i < entries; i++) |
206 | { | 206 | { |
207 | matches = SSCANF (token, "%s %s", subject_pkey, attr_str); | 207 | matches = SSCANF (token, "%s %s", subject_pkey, attr_str); |
@@ -220,7 +220,7 @@ credential_string_to_value (void *cls, | |||
220 | // If more entries, then token string can take the next entry (separated by ',') by calling strtok again | 220 | // If more entries, then token string can take the next entry (separated by ',') by calling strtok again |
221 | token = strtok (NULL, ","); | 221 | token = strtok (NULL, ","); |
222 | } | 222 | } |
223 | tmp_data_size = GNUNET_CREDENTIAL_delegation_set_get_size (entries, set); | 223 | tmp_data_size = GNUNET_ABD_delegation_set_get_size (entries, set); |
224 | 224 | ||
225 | if (-1 == tmp_data_size) | 225 | if (-1 == tmp_data_size) |
226 | { | 226 | { |
@@ -229,7 +229,7 @@ credential_string_to_value (void *cls, | |||
229 | } | 229 | } |
230 | *data_size += tmp_data_size; | 230 | *data_size += tmp_data_size; |
231 | *data = sets = GNUNET_malloc (*data_size); | 231 | *data = sets = GNUNET_malloc (*data_size); |
232 | GNUNET_CREDENTIAL_delegation_set_serialize (entries, | 232 | GNUNET_ABD_delegation_set_serialize (entries, |
233 | set, | 233 | set, |
234 | tmp_data_size, | 234 | tmp_data_size, |
235 | (char *) &sets[1]); | 235 | (char *) &sets[1]); |
@@ -246,10 +246,10 @@ credential_string_to_value (void *cls, | |||
246 | } | 246 | } |
247 | case GNUNET_GNSRECORD_TYPE_DELEGATE: | 247 | case GNUNET_GNSRECORD_TYPE_DELEGATE: |
248 | { | 248 | { |
249 | struct GNUNET_CREDENTIAL_Delegate *cred; | 249 | struct GNUNET_ABD_Delegate *cred; |
250 | cred = GNUNET_CREDENTIAL_delegate_from_string (s); | 250 | cred = GNUNET_ABD_delegate_from_string (s); |
251 | 251 | ||
252 | *data_size = GNUNET_CREDENTIAL_delegate_serialize (cred, (char **) data); | 252 | *data_size = GNUNET_ABD_delegate_serialize (cred, (char **) data); |
253 | 253 | ||
254 | return GNUNET_OK; | 254 | return GNUNET_OK; |
255 | } | 255 | } |
@@ -267,8 +267,7 @@ static struct | |||
267 | { | 267 | { |
268 | const char *name; | 268 | const char *name; |
269 | uint32_t number; | 269 | uint32_t number; |
270 | } name_map[] = {{"CRED", GNUNET_GNSRECORD_TYPE_CREDENTIAL}, | 270 | } name_map[] = {{"ATTR", GNUNET_GNSRECORD_TYPE_ATTRIBUTE}, |
271 | {"ATTR", GNUNET_GNSRECORD_TYPE_ATTRIBUTE}, | ||
272 | {"DEL", GNUNET_GNSRECORD_TYPE_DELEGATE}, | 271 | {"DEL", GNUNET_GNSRECORD_TYPE_DELEGATE}, |
273 | {NULL, UINT32_MAX}}; | 272 | {NULL, UINT32_MAX}}; |
274 | 273 | ||
@@ -281,7 +280,7 @@ static struct | |||
281 | * @return corresponding number, UINT32_MAX on error | 280 | * @return corresponding number, UINT32_MAX on error |
282 | */ | 281 | */ |
283 | static uint32_t | 282 | static uint32_t |
284 | credential_typename_to_number (void *cls, const char *gns_typename) | 283 | abd_typename_to_number (void *cls, const char *gns_typename) |
285 | { | 284 | { |
286 | unsigned int i; | 285 | unsigned int i; |
287 | 286 | ||
@@ -301,7 +300,7 @@ credential_typename_to_number (void *cls, const char *gns_typename) | |||
301 | * @return corresponding typestring, NULL on error | 300 | * @return corresponding typestring, NULL on error |
302 | */ | 301 | */ |
303 | static const char * | 302 | static const char * |
304 | credential_number_to_typename (void *cls, uint32_t type) | 303 | abd_number_to_typename (void *cls, uint32_t type) |
305 | { | 304 | { |
306 | unsigned int i; | 305 | unsigned int i; |
307 | 306 | ||
@@ -319,15 +318,15 @@ credential_number_to_typename (void *cls, uint32_t type) | |||
319 | * @return the exported block API | 318 | * @return the exported block API |
320 | */ | 319 | */ |
321 | void * | 320 | void * |
322 | libgnunet_plugin_gnsrecord_credential_init (void *cls) | 321 | libgnunet_plugin_gnsrecord_abd_init (void *cls) |
323 | { | 322 | { |
324 | struct GNUNET_GNSRECORD_PluginFunctions *api; | 323 | struct GNUNET_GNSRECORD_PluginFunctions *api; |
325 | 324 | ||
326 | api = GNUNET_new (struct GNUNET_GNSRECORD_PluginFunctions); | 325 | api = GNUNET_new (struct GNUNET_GNSRECORD_PluginFunctions); |
327 | api->value_to_string = &credential_value_to_string; | 326 | api->value_to_string = &abd_value_to_string; |
328 | api->string_to_value = &credential_string_to_value; | 327 | api->string_to_value = &abd_string_to_value; |
329 | api->typename_to_number = &credential_typename_to_number; | 328 | api->typename_to_number = &abd_typename_to_number; |
330 | api->number_to_typename = &credential_number_to_typename; | 329 | api->number_to_typename = &abd_number_to_typename; |
331 | return api; | 330 | return api; |
332 | } | 331 | } |
333 | 332 | ||
@@ -339,7 +338,7 @@ libgnunet_plugin_gnsrecord_credential_init (void *cls) | |||
339 | * @return NULL | 338 | * @return NULL |
340 | */ | 339 | */ |
341 | void * | 340 | void * |
342 | libgnunet_plugin_gnsrecord_credential_done (void *cls) | 341 | libgnunet_plugin_gnsrecord_abd_done (void *cls) |
343 | { | 342 | { |
344 | struct GNUNET_GNSRECORD_PluginFunctions *api = cls; | 343 | struct GNUNET_GNSRECORD_PluginFunctions *api = cls; |
345 | 344 | ||
@@ -347,4 +346,4 @@ libgnunet_plugin_gnsrecord_credential_done (void *cls) | |||
347 | return NULL; | 346 | return NULL; |
348 | } | 347 | } |
349 | 348 | ||
350 | /* end of plugin_gnsrecord_credential.c */ | 349 | /* end of plugin_gnsrecord_abd.c */ |
diff --git a/src/credential/plugin_rest_credential.c b/src/abd/plugin_rest_credential.c index 513ddfff9..513ddfff9 100644 --- a/src/credential/plugin_rest_credential.c +++ b/src/abd/plugin_rest_credential.c | |||
diff --git a/src/abd/test_abd_bi_and.sh b/src/abd/test_abd_bi_and.sh new file mode 100755 index 000000000..b32313636 --- /dev/null +++ b/src/abd/test_abd_bi_and.sh | |||
@@ -0,0 +1,98 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_abd_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_abd_lookup.conf | ||
25 | gnunet-identity -C b -c test_abd_lookup.conf | ||
26 | gnunet-identity -C c -c test_abd_lookup.conf | ||
27 | gnunet-identity -C d -c test_abd_lookup.conf | ||
28 | gnunet-identity -C e -c test_abd_lookup.conf | ||
29 | gnunet-identity -C f -c test_abd_lookup.conf | ||
30 | gnunet-identity -C g -c test_abd_lookup.conf | ||
31 | gnunet-identity -C h -c test_abd_lookup.conf | ||
32 | AKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep a | awk '{print $3}') | ||
33 | BKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep b | awk '{print $3}') | ||
34 | CKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep c | awk '{print $3}') | ||
35 | DKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep d | awk '{print $3}') | ||
36 | EKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep e | awk '{print $3}') | ||
37 | FKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep f | awk '{print $3}') | ||
38 | GKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep g | awk '{print $3}') | ||
39 | HKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep h | awk '{print $3}') | ||
40 | gnunet-identity -d | ||
41 | |||
42 | # (1) (A.a) <- B.b | ||
43 | # (2) (B.b) <- C.c AND G.g | ||
44 | # (3) C.c <- (D.D) | ||
45 | # (4) D.d <- (E.e) | ||
46 | # (5) E.e <- (F) priv | ||
47 | # (6) (G.g) <- H.h | ||
48 | # (7) H.h <- (F) priv | ||
49 | |||
50 | # BIDIRECTIONAL | ||
51 | gnunet-abd --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_abd_lookup.conf | ||
52 | gnunet-namestore -D -z a | ||
53 | gnunet-abd --createIssuerSide --ego=b --attribute="b" --subject="$CKEY c, $GKEY g" --ttl=5m -c test_abd_lookup.conf | ||
54 | gnunet-namestore -D -z b | ||
55 | gnunet-abd --createIssuerSide --ego=g --attribute="g" --subject="$HKEY h" --ttl=5m -c test_abd_lookup.conf | ||
56 | gnunet-namestore -D -z b | ||
57 | |||
58 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
59 | gnunet-abd --createSubjectSide --ego=d --import="$SIGNED" | ||
60 | gnunet-namestore -D -z d | ||
61 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
62 | gnunet-abd --createSubjectSide --ego=e --import="$SIGNED" | ||
63 | gnunet-namestore -D -z e | ||
64 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=e --attribute="e" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
65 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" --private | ||
66 | gnunet-namestore -D -z f | ||
67 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=h --attribute="h" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
68 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" --private | ||
69 | gnunet-namestore -D -z h | ||
70 | |||
71 | # Starting to resolve | ||
72 | echo "+++ Starting to Resolve +++" | ||
73 | |||
74 | DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$AKEY --attribute="a" --ego=f --forward --backward -c test_abd_lookup.conf | paste -d, -s - -` | ||
75 | echo $DELS | ||
76 | echo gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' --forward --backward -c test_abd_lookup.conf | ||
77 | gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" --forward --backward -c test_abd_lookup.conf | ||
78 | |||
79 | RES=$? | ||
80 | |||
81 | # Cleanup properly | ||
82 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_abd_lookup.conf | ||
83 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_abd_lookup.conf | ||
84 | gnunet-namestore -z g -d -n "g" -t ATTR -c test_abd_lookup.conf | ||
85 | gnunet-namestore -z d -d -n "@" -t DEL -c test_abd_lookup.conf | ||
86 | gnunet-namestore -z e -d -n "@" -t DEL -c test_abd_lookup.conf | ||
87 | gnunet-namestore -z f -d -n "@" -t DEL -c test_abd_lookup.conf | ||
88 | |||
89 | gnunet-arm -e -c test_abd_lookup.conf | ||
90 | |||
91 | if [ "$RES" == 0 ] | ||
92 | then | ||
93 | exit 0 | ||
94 | else | ||
95 | echo "FAIL: Failed to verify credential." | ||
96 | exit 1 | ||
97 | fi | ||
98 | |||
diff --git a/src/abd/test_abd_bi_and2.sh b/src/abd/test_abd_bi_and2.sh new file mode 100755 index 000000000..8d1601ef4 --- /dev/null +++ b/src/abd/test_abd_bi_and2.sh | |||
@@ -0,0 +1,94 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_abd_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_abd_lookup.conf | ||
25 | gnunet-identity -C b -c test_abd_lookup.conf | ||
26 | gnunet-identity -C c -c test_abd_lookup.conf | ||
27 | gnunet-identity -C d -c test_abd_lookup.conf | ||
28 | gnunet-identity -C e -c test_abd_lookup.conf | ||
29 | gnunet-identity -C f -c test_abd_lookup.conf | ||
30 | gnunet-identity -C g -c test_abd_lookup.conf | ||
31 | gnunet-identity -C h -c test_abd_lookup.conf | ||
32 | AKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep a | awk '{print $3}') | ||
33 | BKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep b | awk '{print $3}') | ||
34 | CKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep c | awk '{print $3}') | ||
35 | DKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep d | awk '{print $3}') | ||
36 | EKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep e | awk '{print $3}') | ||
37 | FKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep f | awk '{print $3}') | ||
38 | GKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep g | awk '{print $3}') | ||
39 | HKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep h | awk '{print $3}') | ||
40 | gnunet-identity -d | ||
41 | |||
42 | # (1) (A.a) <- B.b | ||
43 | # (2) (B.b) <- C.c AND G.g | ||
44 | # (3) C.c <- (D.D) | ||
45 | # (4) D.d <- (E.e) | ||
46 | # (5) E.e <- (F) priv | ||
47 | # (6) G.g <- (F) priv | ||
48 | |||
49 | # BIDIRECTIONAL | ||
50 | gnunet-abd --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_abd_lookup.conf | ||
51 | gnunet-namestore -D -z a | ||
52 | gnunet-abd --createIssuerSide --ego=b --attribute="b" --subject="$CKEY c, $GKEY g" --ttl=5m -c test_abd_lookup.conf | ||
53 | gnunet-namestore -D -z b | ||
54 | |||
55 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
56 | gnunet-abd --createSubjectSide --ego=d --import="$SIGNED" | ||
57 | gnunet-namestore -D -z d | ||
58 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
59 | gnunet-abd --createSubjectSide --ego=e --import="$SIGNED" | ||
60 | gnunet-namestore -D -z e | ||
61 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=e --attribute="e" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
62 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" --private | ||
63 | gnunet-namestore -D -z f | ||
64 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=g --attribute="g" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
65 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" --private | ||
66 | gnunet-namestore -D -z h | ||
67 | |||
68 | # Starting to resolve | ||
69 | echo "+++ Starting to Resolve +++" | ||
70 | |||
71 | DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$AKEY --attribute="a" --ego=f -c test_abd_lookup.conf | paste -d, -s - -` | ||
72 | echo $DELS | ||
73 | echo gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' -c test_abd_lookup.conf | ||
74 | gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" -c test_abd_lookup.conf | ||
75 | |||
76 | RES=$? | ||
77 | |||
78 | # Cleanup properly | ||
79 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_abd_lookup.conf | ||
80 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_abd_lookup.conf | ||
81 | gnunet-namestore -z d -d -n "@" -t DEL -c test_abd_lookup.conf | ||
82 | gnunet-namestore -z e -d -n "@" -t DEL -c test_abd_lookup.conf | ||
83 | gnunet-namestore -z f -d -n "@" -t DEL -c test_abd_lookup.conf | ||
84 | |||
85 | gnunet-arm -e -c test_abd_lookup.conf | ||
86 | |||
87 | if [ "$RES" == 0 ] | ||
88 | then | ||
89 | exit 0 | ||
90 | else | ||
91 | echo "FAIL: Failed to verify credential." | ||
92 | exit 1 | ||
93 | fi | ||
94 | |||
diff --git a/src/abd/test_abd_bi_and3.sh b/src/abd/test_abd_bi_and3.sh new file mode 100755 index 000000000..cde2a020b --- /dev/null +++ b/src/abd/test_abd_bi_and3.sh | |||
@@ -0,0 +1,96 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
21 | gnunet-arm -s -c test_abd_lookup.conf | ||
22 | |||
23 | gnunet-identity -C a -c test_abd_lookup.conf | ||
24 | gnunet-identity -C b -c test_abd_lookup.conf | ||
25 | gnunet-identity -C c -c test_abd_lookup.conf | ||
26 | gnunet-identity -C d -c test_abd_lookup.conf | ||
27 | gnunet-identity -C e -c test_abd_lookup.conf | ||
28 | gnunet-identity -C f -c test_abd_lookup.conf | ||
29 | gnunet-identity -C g -c test_abd_lookup.conf | ||
30 | gnunet-identity -C h -c test_abd_lookup.conf | ||
31 | AKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep a | awk '{print $3}') | ||
32 | BKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep b | awk '{print $3}') | ||
33 | CKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep c | awk '{print $3}') | ||
34 | DKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep d | awk '{print $3}') | ||
35 | EKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep e | awk '{print $3}') | ||
36 | FKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep f | awk '{print $3}') | ||
37 | GKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep g | awk '{print $3}') | ||
38 | HKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep h | awk '{print $3}') | ||
39 | gnunet-identity -d | ||
40 | |||
41 | # (1) (A.a) <- B.b | ||
42 | # (2) (B.b) <- C.c AND G.g | ||
43 | # (3) C.c <- (D.d) | ||
44 | # (4) D.d <- (E.e) | ||
45 | # (5) E.e <- (F) priv | ||
46 | # (6) G.g <- (H.h) | ||
47 | # (7) H.h <- (F) priv | ||
48 | |||
49 | # BIDIRECTIONAL | ||
50 | gnunet-abd --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_abd_lookup.conf | ||
51 | gnunet-namestore -D -z a | ||
52 | gnunet-abd --createIssuerSide --ego=b --attribute="b" --subject="$CKEY c, $GKEY g" --ttl=5m -c test_abd_lookup.conf | ||
53 | gnunet-namestore -D -z b | ||
54 | |||
55 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
56 | gnunet-abd --createSubjectSide --ego=d --import="$SIGNED" | ||
57 | gnunet-namestore -D -z d | ||
58 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
59 | gnunet-abd --createSubjectSide --ego=e --import="$SIGNED" | ||
60 | gnunet-namestore -D -z e | ||
61 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=g --attribute="g" --subject="$HKEY h" --ttl="2019-12-12 10:00:00"` | ||
62 | gnunet-abd --createSubjectSide --ego=h --import="$SIGNED" | ||
63 | gnunet-namestore -D -z h | ||
64 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=e --attribute="e" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
65 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" --private | ||
66 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=h --attribute="h" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
67 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" --private | ||
68 | gnunet-namestore -D -z f | ||
69 | |||
70 | # Starting to resolve | ||
71 | echo "+++ Starting to Resolve +++" | ||
72 | |||
73 | DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$AKEY --attribute="a" --ego=f -c test_abd_lookup.conf | paste -d, -s - -` | ||
74 | echo $DELS | ||
75 | echo gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' -c test_abd_lookup.conf | ||
76 | gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" -c test_abd_lookup.conf | ||
77 | |||
78 | RES=$? | ||
79 | |||
80 | # Cleanup properly | ||
81 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_abd_lookup.conf | ||
82 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_abd_lookup.conf | ||
83 | gnunet-namestore -z d -d -n "@" -t DEL -c test_abd_lookup.conf | ||
84 | gnunet-namestore -z e -d -n "@" -t DEL -c test_abd_lookup.conf | ||
85 | gnunet-namestore -z f -d -n "@" -t DEL -c test_abd_lookup.conf | ||
86 | gnunet-namestore -z h -d -n "@" -t DEL -c test_abd_lookup.conf | ||
87 | |||
88 | gnunet-arm -e -c test_abd_lookup.conf | ||
89 | |||
90 | if [ "$RES" == 0 ] | ||
91 | then | ||
92 | exit 0 | ||
93 | else | ||
94 | echo "FAIL: Failed to verify credential." | ||
95 | exit 1 | ||
96 | fi | ||
diff --git a/src/abd/test_abd_bi_and4.sh b/src/abd/test_abd_bi_and4.sh new file mode 100755 index 000000000..e8cd6efd6 --- /dev/null +++ b/src/abd/test_abd_bi_and4.sh | |||
@@ -0,0 +1,83 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_abd_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_abd_lookup.conf | ||
25 | gnunet-identity -C b -c test_abd_lookup.conf | ||
26 | gnunet-identity -C c -c test_abd_lookup.conf | ||
27 | gnunet-identity -C d -c test_abd_lookup.conf | ||
28 | gnunet-identity -C e -c test_abd_lookup.conf | ||
29 | gnunet-identity -C f -c test_abd_lookup.conf | ||
30 | gnunet-identity -C g -c test_abd_lookup.conf | ||
31 | gnunet-identity -C h -c test_abd_lookup.conf | ||
32 | AKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep a | awk '{print $3}') | ||
33 | BKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep b | awk '{print $3}') | ||
34 | CKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep c | awk '{print $3}') | ||
35 | DKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep d | awk '{print $3}') | ||
36 | EKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep e | awk '{print $3}') | ||
37 | FKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep f | awk '{print $3}') | ||
38 | GKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep g | awk '{print $3}') | ||
39 | HKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep h | awk '{print $3}') | ||
40 | gnunet-identity -d | ||
41 | |||
42 | # (1) (A.a) <- B.b | ||
43 | # (2) (B.b) <- C.c AND G.g | ||
44 | # (3) C.c <- (F) priv | ||
45 | # (4) G.g <- (F) priv | ||
46 | |||
47 | # BIDIRECTIONAL | ||
48 | gnunet-abd --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_abd_lookup.conf | ||
49 | gnunet-namestore -D -z a | ||
50 | gnunet-abd --createIssuerSide --ego=b --attribute="b" --subject="$CKEY c, $GKEY g" --ttl=5m -c test_abd_lookup.conf | ||
51 | gnunet-namestore -D -z b | ||
52 | |||
53 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=g --attribute="g" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
54 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" --private | ||
55 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=c --attribute="c" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
56 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" --private | ||
57 | gnunet-namestore -D -z f | ||
58 | |||
59 | # Starting to resolve | ||
60 | echo "+++ Starting to Resolve +++" | ||
61 | |||
62 | DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$AKEY --attribute="a" --ego=f --backward -c test_abd_lookup.conf | paste -d, -s - -` | ||
63 | echo $DELS | ||
64 | echo gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' --backward -c test_abd_lookup.conf | ||
65 | gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" --backward -c test_abd_lookup.conf | ||
66 | |||
67 | RES=$? | ||
68 | |||
69 | # Cleanup properly | ||
70 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_abd_lookup.conf | ||
71 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_abd_lookup.conf | ||
72 | gnunet-namestore -z f -d -n "@" -t DEL -c test_abd_lookup.conf | ||
73 | |||
74 | gnunet-arm -e -c test_abd_lookup.conf | ||
75 | |||
76 | if [ "$RES" == 0 ] | ||
77 | then | ||
78 | exit 0 | ||
79 | else | ||
80 | echo "FAIL: Failed to verify credential." | ||
81 | exit 1 | ||
82 | fi | ||
83 | |||
diff --git a/src/abd/test_abd_bi_bw.sh b/src/abd/test_abd_bi_bw.sh new file mode 100755 index 000000000..6b0e51722 --- /dev/null +++ b/src/abd/test_abd_bi_bw.sh | |||
@@ -0,0 +1,87 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_abd_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_abd_lookup.conf | ||
25 | gnunet-identity -C b -c test_abd_lookup.conf | ||
26 | gnunet-identity -C c -c test_abd_lookup.conf | ||
27 | gnunet-identity -C d -c test_abd_lookup.conf | ||
28 | gnunet-identity -C e -c test_abd_lookup.conf | ||
29 | gnunet-identity -C f -c test_abd_lookup.conf | ||
30 | gnunet-identity -C g -c test_abd_lookup.conf | ||
31 | AKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep a | awk '{print $3}') | ||
32 | BKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep b | awk '{print $3}') | ||
33 | CKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep c | awk '{print $3}') | ||
34 | DKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep d | awk '{print $3}') | ||
35 | EKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep e | awk '{print $3}') | ||
36 | FKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep f | awk '{print $3}') | ||
37 | GKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep g | awk '{print $3}') | ||
38 | gnunet-identity -d | ||
39 | |||
40 | # (1) (A.a) <- B.b | ||
41 | # (2) (B.b) <- C.c | ||
42 | # (3) C.c <- (D.D) | ||
43 | # (4) D.d <- (E.e) | ||
44 | # (5) E.e <- (F) | ||
45 | |||
46 | # BIDIRECTIONAL | ||
47 | gnunet-abd --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_abd_lookup.conf | ||
48 | gnunet-namestore -D -z a | ||
49 | gnunet-abd --createIssuerSide --ego=b --attribute="b" --subject="$CKEY c" --ttl=5m -c test_abd_lookup.conf | ||
50 | gnunet-namestore -D -z b | ||
51 | |||
52 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
53 | gnunet-abd --createSubjectSide --ego=d --import="$SIGNED" | ||
54 | gnunet-namestore -D -z d | ||
55 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
56 | gnunet-abd --createSubjectSide --ego=e --import="$SIGNED" | ||
57 | gnunet-namestore -D -z e | ||
58 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=e --attribute="e" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
59 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" --private | ||
60 | gnunet-namestore -D -z f | ||
61 | |||
62 | # Starting to resolve | ||
63 | echo "+++ Starting to Resolve +++" | ||
64 | |||
65 | DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$AKEY --attribute="a" --ego=f --forward --backward -c test_abd_lookup.conf | paste -d, -s - -` | ||
66 | echo $DELS | ||
67 | echo gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' --forward --backward -c test_abd_lookup.conf | ||
68 | gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" --forward --backward -c test_abd_lookup.conf | ||
69 | |||
70 | RES=$? | ||
71 | |||
72 | # Cleanup properly | ||
73 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_abd_lookup.conf | ||
74 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_abd_lookup.conf | ||
75 | gnunet-namestore -z d -d -n "@" -t DEL -c test_abd_lookup.conf | ||
76 | gnunet-namestore -z e -d -n "@" -t DEL -c test_abd_lookup.conf | ||
77 | gnunet-namestore -z f -d -n "@" -t DEL -c test_abd_lookup.conf | ||
78 | |||
79 | gnunet-arm -e -c test_abd_lookup.conf | ||
80 | |||
81 | if [ "$RES" == 0 ] | ||
82 | then | ||
83 | exit 0 | ||
84 | else | ||
85 | echo "FAIL: Failed to verify credential." | ||
86 | exit 1 | ||
87 | fi | ||
diff --git a/src/abd/test_abd_bi_bw_link.sh b/src/abd/test_abd_bi_bw_link.sh new file mode 100755 index 000000000..f60f78827 --- /dev/null +++ b/src/abd/test_abd_bi_bw_link.sh | |||
@@ -0,0 +1,92 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_abd_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_abd_lookup.conf | ||
25 | gnunet-identity -C b -c test_abd_lookup.conf | ||
26 | gnunet-identity -C c -c test_abd_lookup.conf | ||
27 | gnunet-identity -C d -c test_abd_lookup.conf | ||
28 | gnunet-identity -C e -c test_abd_lookup.conf | ||
29 | gnunet-identity -C f -c test_abd_lookup.conf | ||
30 | gnunet-identity -C g -c test_abd_lookup.conf | ||
31 | AKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep a | awk '{print $3}') | ||
32 | BKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep b | awk '{print $3}') | ||
33 | CKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep c | awk '{print $3}') | ||
34 | DKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep d | awk '{print $3}') | ||
35 | EKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep e | awk '{print $3}') | ||
36 | FKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep f | awk '{print $3}') | ||
37 | GKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep g | awk '{print $3}') | ||
38 | gnunet-identity -d | ||
39 | |||
40 | # (1) (A.a) <- B.b | ||
41 | # (2) (B.b) <- G.g.c | ||
42 | # (3) (G.g) <- C | ||
43 | # (3) C.c <- (D.D) | ||
44 | # (4) D.d <- (E.e) | ||
45 | # (5) E.e <- (F) | ||
46 | |||
47 | # BIDIRECTIONAL | ||
48 | gnunet-abd --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_abd_lookup.conf | ||
49 | gnunet-namestore -D -z a | ||
50 | gnunet-abd --createIssuerSide --ego=b --attribute="b" --subject="$GKEY g.c" --ttl=5m -c test_abd_lookup.conf | ||
51 | gnunet-namestore -D -z b | ||
52 | gnunet-abd --createIssuerSide --ego=g --attribute="g" --subject="$CKEY" --ttl=5m -c test_abd_lookup.conf | ||
53 | gnunet-namestore -D -z b | ||
54 | |||
55 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
56 | gnunet-abd --createSubjectSide --ego=d --import="$SIGNED" | ||
57 | gnunet-namestore -D -z d | ||
58 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
59 | gnunet-abd --createSubjectSide --ego=e --import="$SIGNED" | ||
60 | gnunet-namestore -D -z e | ||
61 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=e --attribute="e" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
62 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" --private | ||
63 | gnunet-namestore -D -z f | ||
64 | |||
65 | # Starting to resolve | ||
66 | echo "+++ Starting to Resolve +++" | ||
67 | |||
68 | DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$AKEY --attribute="a" --ego=f --forward --backward -c test_abd_lookup.conf | paste -d, -s - -` | ||
69 | echo $DELS | ||
70 | echo gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' --forward --backward -c test_abd_lookup.conf | ||
71 | gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" --forward --backward -c test_abd_lookup.conf | ||
72 | |||
73 | RES=$? | ||
74 | |||
75 | # Cleanup properly | ||
76 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_abd_lookup.conf | ||
77 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_abd_lookup.conf | ||
78 | gnunet-namestore -z g -d -n "g" -t ATTR -c test_abd_lookup.conf | ||
79 | gnunet-namestore -z d -d -n "@" -t DEL -c test_abd_lookup.conf | ||
80 | gnunet-namestore -z e -d -n "@" -t DEL -c test_abd_lookup.conf | ||
81 | gnunet-namestore -z f -d -n "@" -t DEL -c test_abd_lookup.conf | ||
82 | |||
83 | gnunet-arm -e -c test_abd_lookup.conf | ||
84 | |||
85 | if [ "$RES" == 0 ] | ||
86 | then | ||
87 | exit 0 | ||
88 | else | ||
89 | echo "FAIL: Failed to verify credential." | ||
90 | exit 1 | ||
91 | fi | ||
92 | |||
diff --git a/src/abd/test_abd_bi_bw_link2.sh b/src/abd/test_abd_bi_bw_link2.sh new file mode 100755 index 000000000..b0fb49b8e --- /dev/null +++ b/src/abd/test_abd_bi_bw_link2.sh | |||
@@ -0,0 +1,93 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_abd_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_abd_lookup.conf | ||
25 | gnunet-identity -C b -c test_abd_lookup.conf | ||
26 | gnunet-identity -C c -c test_abd_lookup.conf | ||
27 | gnunet-identity -C d -c test_abd_lookup.conf | ||
28 | gnunet-identity -C e -c test_abd_lookup.conf | ||
29 | gnunet-identity -C f -c test_abd_lookup.conf | ||
30 | gnunet-identity -C g -c test_abd_lookup.conf | ||
31 | AKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep a | awk '{print $3}') | ||
32 | BKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep b | awk '{print $3}') | ||
33 | CKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep c | awk '{print $3}') | ||
34 | DKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep d | awk '{print $3}') | ||
35 | EKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep e | awk '{print $3}') | ||
36 | FKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep f | awk '{print $3}') | ||
37 | GKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep g | awk '{print $3}') | ||
38 | gnunet-identity -d | ||
39 | |||
40 | # (1) (A.a) <- B.b | ||
41 | # (2) (B.b) <- G.g.c | ||
42 | # (3) G.g <- (C) | ||
43 | # (3) C.c <- (D.d) | ||
44 | # (4) D.d <- (E.e) | ||
45 | # (5) E.e <- (F) | ||
46 | |||
47 | # BIDIRECTIONAL | ||
48 | gnunet-abd --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_abd_lookup.conf | ||
49 | gnunet-namestore -D -z a | ||
50 | gnunet-abd --createIssuerSide --ego=b --attribute="b" --subject="$GKEY g.c" --ttl=5m -c test_abd_lookup.conf | ||
51 | gnunet-namestore -D -z b | ||
52 | |||
53 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=g --attribute="g" --subject="$CKEY" --ttl="2019-12-12 10:00:00"` | ||
54 | gnunet-abd --createSubjectSide --ego=c --import="$SIGNED" | ||
55 | gnunet-namestore -D -z c | ||
56 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
57 | gnunet-abd --createSubjectSide --ego=d --import="$SIGNED" | ||
58 | gnunet-namestore -D -z d | ||
59 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
60 | gnunet-abd --createSubjectSide --ego=e --import="$SIGNED" | ||
61 | gnunet-namestore -D -z e | ||
62 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=e --attribute="e" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
63 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" --private | ||
64 | gnunet-namestore -D -z f | ||
65 | |||
66 | # Starting to resolve | ||
67 | echo "+++ Starting to Resolve +++" | ||
68 | |||
69 | DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$AKEY --attribute="a" --ego=f --forward --backward -c test_abd_lookup.conf | paste -d, -s - -` | ||
70 | echo $DELS | ||
71 | echo gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' --forward --backward -c test_abd_lookup.conf | ||
72 | gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" --forward --backward -c test_abd_lookup.conf | ||
73 | |||
74 | RES=$? | ||
75 | |||
76 | # Cleanup properly | ||
77 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_abd_lookup.conf | ||
78 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_abd_lookup.conf | ||
79 | gnunet-namestore -z c -d -n "@" -t DEL -c test_abd_lookup.conf | ||
80 | gnunet-namestore -z d -d -n "@" -t DEL -c test_abd_lookup.conf | ||
81 | gnunet-namestore -z e -d -n "@" -t DEL -c test_abd_lookup.conf | ||
82 | gnunet-namestore -z f -d -n "@" -t DEL -c test_abd_lookup.conf | ||
83 | |||
84 | gnunet-arm -e -c test_abd_lookup.conf | ||
85 | |||
86 | if [ "$RES" == 0 ] | ||
87 | then | ||
88 | exit 0 | ||
89 | else | ||
90 | echo "FAIL: Failed to verify credential." | ||
91 | exit 1 | ||
92 | fi | ||
93 | |||
diff --git a/src/abd/test_abd_bi_fw.sh b/src/abd/test_abd_bi_fw.sh new file mode 100755 index 000000000..75a940fbe --- /dev/null +++ b/src/abd/test_abd_bi_fw.sh | |||
@@ -0,0 +1,92 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_abd_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_abd_lookup.conf | ||
25 | gnunet-identity -C b -c test_abd_lookup.conf | ||
26 | gnunet-identity -C c -c test_abd_lookup.conf | ||
27 | gnunet-identity -C d -c test_abd_lookup.conf | ||
28 | gnunet-identity -C e -c test_abd_lookup.conf | ||
29 | gnunet-identity -C f -c test_abd_lookup.conf | ||
30 | gnunet-identity -C g -c test_abd_lookup.conf | ||
31 | AKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep a | awk '{print $3}') | ||
32 | BKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep b | awk '{print $3}') | ||
33 | CKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep c | awk '{print $3}') | ||
34 | DKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep d | awk '{print $3}') | ||
35 | EKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep e | awk '{print $3}') | ||
36 | FKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep f | awk '{print $3}') | ||
37 | GKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep g | awk '{print $3}') | ||
38 | gnunet-identity -d | ||
39 | |||
40 | # (1) (A.a) <- B.b | ||
41 | # (2) (B.b) <- C.c | ||
42 | # (3) C.c <- (D.D) | ||
43 | # (4) D.d <- (E.e) | ||
44 | # (5) E.e <- (F.f) | ||
45 | # (6) F.f <- (G) | ||
46 | |||
47 | # BIDIRECTIONAL | ||
48 | gnunet-abd --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_abd_lookup.conf | ||
49 | gnunet-namestore -D -z a | ||
50 | gnunet-abd --createIssuerSide --ego=b --attribute="b" --subject="$CKEY c" --ttl=5m -c test_abd_lookup.conf | ||
51 | gnunet-namestore -D -z b | ||
52 | |||
53 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
54 | gnunet-abd --createSubjectSide --ego=d --import="$SIGNED" | ||
55 | gnunet-namestore -D -z d | ||
56 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
57 | gnunet-abd --createSubjectSide --ego=e --import="$SIGNED" | ||
58 | gnunet-namestore -D -z e | ||
59 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=e --attribute="e" --subject="$FKEY f" --ttl="2019-12-12 10:00:00"` | ||
60 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" | ||
61 | gnunet-namestore -D -z f | ||
62 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=f --attribute="f" --subject="$GKEY" --ttl="2019-12-12 10:00:00"` | ||
63 | gnunet-abd --createSubjectSide --ego=g --import="$SIGNED" --private | ||
64 | gnunet-namestore -D -z g | ||
65 | |||
66 | # Starting to resolve | ||
67 | echo "+++ Starting to Resolve +++" | ||
68 | |||
69 | DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$AKEY --attribute="a" --ego=g --forward --backward -c test_abd_lookup.conf | paste -d, -s - -` | ||
70 | echo $DELS | ||
71 | echo gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$GKEY --delegate=\'$DELS\' --forward --backward -c test_abd_lookup.conf | ||
72 | gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$GKEY --delegate="$DELS" --forward --backward -c test_abd_lookup.conf | ||
73 | |||
74 | RES=$? | ||
75 | |||
76 | # Cleanup properly | ||
77 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_abd_lookup.conf | ||
78 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_abd_lookup.conf | ||
79 | gnunet-namestore -z d -d -n "@" -t DEL -c test_abd_lookup.conf | ||
80 | gnunet-namestore -z e -d -n "@" -t DEL -c test_abd_lookup.conf | ||
81 | gnunet-namestore -z f -d -n "@" -t DEL -c test_abd_lookup.conf | ||
82 | gnunet-namestore -z g -d -n "@" -t DEL -c test_abd_lookup.conf | ||
83 | |||
84 | gnunet-arm -e -c test_abd_lookup.conf | ||
85 | |||
86 | if [ "$RES" == 0 ] | ||
87 | then | ||
88 | exit 0 | ||
89 | else | ||
90 | echo "FAIL: Failed to verify credential." | ||
91 | exit 1 | ||
92 | fi | ||
diff --git a/src/credential/test_credential_defaults.conf b/src/abd/test_abd_defaults.conf index 39f82ad16..7b4cb576d 100644 --- a/src/credential/test_credential_defaults.conf +++ b/src/abd/test_abd_defaults.conf | |||
@@ -1,7 +1,7 @@ | |||
1 | @INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf | 1 | @INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf |
2 | 2 | ||
3 | [PATHS] | 3 | [PATHS] |
4 | GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-credential-testing/ | 4 | GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-abd-testing/ |
5 | 5 | ||
6 | [namestore-sqlite] | 6 | [namestore-sqlite] |
7 | FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db | 7 | FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db |
diff --git a/src/abd/test_abd_issue.sh b/src/abd/test_abd_issue.sh new file mode 100755 index 000000000..8076aa921 --- /dev/null +++ b/src/abd/test_abd_issue.sh | |||
@@ -0,0 +1,46 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | # (1) PKEY1.user -> PKEY2.resu.user | ||
19 | # (2) PKEY2.resu -> PKEY3 | ||
20 | # (3) PKEY3.user -> PKEY4 | ||
21 | |||
22 | |||
23 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30" | ||
24 | |||
25 | TEST_ATTR="test" | ||
26 | gnunet-arm -s -c test_abd_lookup.conf | ||
27 | gnunet-identity -C testissuer -c test_abd_lookup.conf | ||
28 | gnunet-identity -C testsubject -c test_abd_lookup.conf | ||
29 | SUBJECT_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep testsubject | awk '{print $3}') | ||
30 | ISSUER_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep testissuer | awk '{print $3}') | ||
31 | |||
32 | # Get abd and store it with subject (3) | ||
33 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=testissuer --attribute=$TEST_ATTR --subject=$SUBJECT_KEY --ttl="2019-12-12 10:00:00" -c test_abd_lookup.conf` | ||
34 | |||
35 | STATUS=$? | ||
36 | |||
37 | if test $? != 0 | ||
38 | then | ||
39 | echo "Error issuing..." | ||
40 | exit 1 | ||
41 | fi | ||
42 | #Try import | ||
43 | $DO_TIMEOUT gnunet-abd --createSubjectSide --ego=testsubject --import="$SIGNED" --private -c test_abd_lookup.conf | ||
44 | RES=$? | ||
45 | gnunet-arm -e -c test_abd_lookup.conf | ||
46 | exit $RES | ||
diff --git a/src/credential/test_credential_lookup.conf b/src/abd/test_abd_lookup.conf index 9cd16605d..4072ba23b 100644 --- a/src/credential/test_credential_lookup.conf +++ b/src/abd/test_abd_lookup.conf | |||
@@ -1,7 +1,7 @@ | |||
1 | @INLINE@ test_credential_defaults.conf | 1 | @INLINE@ test_abd_defaults.conf |
2 | 2 | ||
3 | [PATHS] | 3 | [PATHS] |
4 | GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-credential-peer-1/ | 4 | GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-abd-peer-1/ |
5 | 5 | ||
6 | [dht] | 6 | [dht] |
7 | START_ON_DEMAND = YES | 7 | START_ON_DEMAND = YES |
@@ -9,7 +9,7 @@ START_ON_DEMAND = YES | |||
9 | [transport] | 9 | [transport] |
10 | PLUGINS = | 10 | PLUGINS = |
11 | 11 | ||
12 | [credential] | 12 | [abd] |
13 | START_ON_DEMAND = YES | 13 | START_ON_DEMAND = YES |
14 | #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=/tmp/credlog | 14 | #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=/tmp/credlog |
15 | 15 | ||
diff --git a/src/abd/test_abd_own.sh b/src/abd/test_abd_own.sh new file mode 100755 index 000000000..f4780ea90 --- /dev/null +++ b/src/abd/test_abd_own.sh | |||
@@ -0,0 +1,140 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
21 | gnunet-arm -s -c test_abd_lookup.conf | ||
22 | |||
23 | gnunet-identity -C a -c test_abd_lookup.conf | ||
24 | gnunet-identity -C d -c test_abd_lookup.conf | ||
25 | gnunet-identity -C e -c test_abd_lookup.conf | ||
26 | gnunet-identity -C f -c test_abd_lookup.conf | ||
27 | gnunet-identity -C g -c test_abd_lookup.conf | ||
28 | AKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep a | awk '{print $3}') | ||
29 | DKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep d | awk '{print $3}') | ||
30 | EKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep e | awk '{print $3}') | ||
31 | FKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep f | awk '{print $3}') | ||
32 | GKEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep g | awk '{print $3}') | ||
33 | |||
34 | ############################################################################################ | ||
35 | # (1) EPub.discount <- EOrg.preferred | ||
36 | # (2) EOrg.preferred <- StateU.student | ||
37 | # (3) StateU.student <- RegistrarB.student | ||
38 | # (4) RegistrarB.student <- Alice | ||
39 | |||
40 | gnunet-identity -C epub -c test_abd_lookup.conf | ||
41 | gnunet-identity -C eorg -c test_abd_lookup.conf | ||
42 | gnunet-identity -C stateu -c test_abd_lookup.conf | ||
43 | gnunet-identity -C registrarb -c test_abd_lookup.conf | ||
44 | gnunet-identity -C alice -c test_abd_lookup.conf | ||
45 | |||
46 | EPUB_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep epub | awk '{print $3}') | ||
47 | EORG_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep eorg | awk '{print $3}') | ||
48 | STATEU_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep stateu | awk '{print $3}') | ||
49 | REGISTRARB_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep registrarb | awk '{print $3}') | ||
50 | ALICE_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep alice | awk '{print $3}') | ||
51 | |||
52 | |||
53 | DISC_ATTR="discount" | ||
54 | PREF_ATTR="preferred" | ||
55 | STATE_STUD_ATTR="student" | ||
56 | REG_STUD_ATTR="student" | ||
57 | END_ATTR="end" | ||
58 | |||
59 | gnunet-identity -d | ||
60 | |||
61 | # FORWARD, subject side stored (different constallations) | ||
62 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=a --attribute="a" --subject="$AKEY b.c" --ttl="2019-12-12 10:00:00"` | ||
63 | gnunet-abd --createSubjectSide --ego=a --import="$SIGNED" | ||
64 | gnunet-namestore -D -z a | ||
65 | |||
66 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=a --attribute="b" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
67 | gnunet-abd --createSubjectSide --ego=d --import="$SIGNED" | ||
68 | gnunet-namestore -D -z d | ||
69 | |||
70 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=d --attribute="d" --subject="$EKEY" --ttl="2019-12-12 10:00:00"` | ||
71 | gnunet-abd --createSubjectSide --ego=e --import="$SIGNED" | ||
72 | gnunet-namestore -D -z e | ||
73 | |||
74 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=e --attribute="c" --subject="$FKEY c" --ttl="2019-12-12 10:00:00"` | ||
75 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" | ||
76 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=e --attribute="k" --subject="$FKEY c.k" --ttl="2019-12-12 10:00:00"` | ||
77 | gnunet-abd --createSubjectSide --ego=f --import="$SIGNED" | ||
78 | gnunet-namestore -D -z f | ||
79 | |||
80 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=f --attribute="c" --subject="$GKEY" --ttl="2019-12-12 10:00:00"` | ||
81 | gnunet-abd --createSubjectSide --ego=g --import="$SIGNED" --private | ||
82 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=a --attribute="c" --subject="$GKEY" --ttl="2019-12-12 10:00:00"` | ||
83 | gnunet-abd --createSubjectSide --ego=g --import="$SIGNED" --private | ||
84 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=d --attribute="h.o" --subject="$GKEY" --ttl="2019-12-12 10:00:00"` | ||
85 | gnunet-abd --createSubjectSide --ego=g --import="$SIGNED" | ||
86 | gnunet-namestore -D -z g | ||
87 | |||
88 | |||
89 | # BACKWARD, issuer side stored | ||
90 | # (1) EPub assigns the attribute "discount" to all entities that have been assigned "preferred" by EOrg | ||
91 | gnunet-abd --createIssuerSide --ego=epub --attribute=$DISC_ATTR --subject="$EORG_KEY $PREF_ATTR" --ttl=5m -c test_abd_lookup.conf | ||
92 | |||
93 | # (2) EOrg assigns the attribute "preferred" to all entities that have been assigned "student" by StateU | ||
94 | gnunet-abd --createIssuerSide --ego=eorg --attribute=$PREF_ATTR --subject="$STATEU_KEY $STATE_STUD_ATTR" --ttl=5m -c test_abd_lookup.conf | ||
95 | |||
96 | # (3) StateU assigns the attribute "student" to all entities that have been asssigned "student" by RegistrarB | ||
97 | gnunet-abd --createIssuerSide --ego=stateu --attribute=$STATE_STUD_ATTR --subject="$REGISTRARB_KEY $REG_STUD_ATTR" --ttl=5m -c test_abd_lookup.conf | ||
98 | |||
99 | # (4) RegistrarB issues Alice the credential "student" | ||
100 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=registrarb --attribute="$REG_STUD_ATTR" --subject="$ALICE_KEY" --ttl="2019-12-12 10:00:00"` | ||
101 | gnunet-abd --createSubjectSide --ego=alice --import="$SIGNED" --private | ||
102 | |||
103 | # Starting to resolve | ||
104 | echo "+++ Starting to Resolve +++" | ||
105 | |||
106 | # FORWARD | ||
107 | #DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$AKEY --attribute="a" --ego=g --forward -c test_abd_lookup.conf | paste -d, -s - -` | ||
108 | #echo $DELS | ||
109 | #echo gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$GKEY --delegate=\'$DELS\' --forward -c test_abd_lookup.conf | ||
110 | #RES_DELS=`gnunet-abd --verify --issuer=$AKEY --attribute="a" --subject=$GKEY --delegate="$DELS" --forward -c test_abd_lookup.conf` | ||
111 | |||
112 | # BACKWARD | ||
113 | DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$EPUB_KEY --attribute=$DISC_ATTR --ego=alice --backward -c test_abd_lookup.conf | paste -d, -s - -` | ||
114 | echo $DELS | ||
115 | echo gnunet-abd --verify --issuer=$EPUB_KEY --attribute=$DISC_ATTR --subject=$ALICE_KEY --delegate=\'$DELS\' --backward -c test_abd_lookup.conf | ||
116 | gnunet-abd --verify --issuer=$EPUB_KEY --attribute=$DISC_ATTR --subject=$ALICE_KEY --delegate="$DELS" --backward -c test_abd_lookup.conf | ||
117 | |||
118 | RES=$? | ||
119 | |||
120 | # Cleanup properly | ||
121 | gnunet-namestore -z epub -d -n $DISC_ATTR -t ATTR -c test_abd_lookup.conf | ||
122 | gnunet-namestore -z eorg -d -n $PREF_ATTR -t ATTR -c test_abd_lookup.conf | ||
123 | gnunet-namestore -z stateu -d -n $STATE_STUD_ATTR -t ATTR -c test_abd_lookup.conf | ||
124 | #gnunet-namestore -z a -d -n "@" -t DEL -c test_abd_lookup.conf | ||
125 | #gnunet-namestore -z d -d -n "@" -t DEL -c test_abd_lookup.conf | ||
126 | #gnunet-namestore -z e -d -n "@" -t DEL -c test_abd_lookup.conf | ||
127 | #gnunet-namestore -z f -d -n "@" -t DEL -c test_abd_lookup.conf | ||
128 | #gnunet-namestore -z g -d -n "@" -t DEL -c test_abd_lookup.conf | ||
129 | |||
130 | |||
131 | gnunet-arm -e -c test_abd_lookup.conf | ||
132 | |||
133 | if [ "$RES" == 0 ] | ||
134 | then | ||
135 | exit 0 | ||
136 | else | ||
137 | echo "FAIL: Failed to verify credential." | ||
138 | exit 1 | ||
139 | fi | ||
140 | |||
diff --git a/src/abd/test_abd_verify.sh b/src/abd/test_abd_verify.sh new file mode 100755 index 000000000..9ece91c62 --- /dev/null +++ b/src/abd/test_abd_verify.sh | |||
@@ -0,0 +1,87 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | # (1) Service.user -> GNU.project.member | ||
19 | # (2) GNU.project -> GNUnet | ||
20 | # (3) GNUnet.member -> GNUnet.developer | ||
21 | # (4) GNUnet.member -> GNUnet.user | ||
22 | # (5) GNUnet.developer -> Alice | ||
23 | |||
24 | |||
25 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30" | ||
26 | gnunet-arm -s -c test_abd_lookup.conf | ||
27 | gnunet-identity -C service -c test_abd_lookup.conf | ||
28 | gnunet-identity -C alice -c test_abd_lookup.conf | ||
29 | gnunet-identity -C gnu -c test_abd_lookup.conf | ||
30 | gnunet-identity -C gnunet -c test_abd_lookup.conf | ||
31 | |||
32 | GNU_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep gnu | grep -v gnunet | awk '{print $3}') | ||
33 | ALICE_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep alice | awk '{print $3}') | ||
34 | GNUNET_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep gnunet | awk '{print $3}') | ||
35 | SERVICE_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep service | awk '{print $3}') | ||
36 | |||
37 | USER_ATTR="user" | ||
38 | GNU_PROJECT_ATTR="project" | ||
39 | MEMBER_ATTR="member" | ||
40 | DEVELOPER_ATTR="developer" | ||
41 | DEV_ATTR="developer" | ||
42 | TEST_CREDENTIAL="mygnunetcreds" | ||
43 | |||
44 | gnunet-identity -d | ||
45 | |||
46 | # (1) A service assigns the attribute "user" to all entities that have been assigned "member" by entities that werde assigned "project" from GNU | ||
47 | gnunet-abd --createIssuerSide --ego=service --attribute="$USER_ATTR" --subject="$GNU_KEY $GNU_PROJECT_ATTR.$MEMBER_ATTR" --ttl="2019-12-12 10:00:00" -c test_abd_lookup.conf | ||
48 | gnunet-namestore -D -z service | ||
49 | |||
50 | # (2) GNU recognized GNUnet as a GNU project and delegates the "project" attribute | ||
51 | gnunet-abd --createIssuerSide --ego=gnu --attribute="$GNU_PROJECT_ATTR" --subject="$GNUNET_KEY" --ttl="2019-12-12 10:00:00" -c test_abd_lookup.conf | ||
52 | gnunet-namestore -D -z gnu | ||
53 | |||
54 | # (3+4) GNUnet assigns the attribute "member" to all entities gnunet has also assigned "developer" or "user" | ||
55 | gnunet-abd --createIssuerSide --ego=gnunet --attribute="$MEMBER_ATTR" --subject="$GNUNET_KEY $DEVELOPER_ATTR" --ttl="2019-12-12 10:00:00" -c test_abd_lookup.conf | ||
56 | gnunet-abd --createIssuerSide --ego=gnunet --attribute="$MEMBER_ATTR" --subject="$GNUNET_KEY $USER_ATTR" --ttl="2019-12-12 10:00:00" -c test_abd_lookup.conf | ||
57 | gnunet-namestore -D -z gnunet | ||
58 | |||
59 | # (5) GNUnet signes the delegate and Alice stores it | ||
60 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=gnunet --attribute=$DEV_ATTR --subject=$ALICE_KEY --ttl="2019-12-12 10:00:00"` | ||
61 | gnunet-abd --createSubjectSide --ego=alice --import="$SIGNED" --private | ||
62 | gnunet-namestore -D -z alice | ||
63 | |||
64 | # Starting to resolve | ||
65 | echo "+++ Starting to Resolve +++" | ||
66 | |||
67 | DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$SERVICE_KEY --attribute=$USER_ATTR --ego=alice --backward -c test_abd_lookup.conf | paste -d, -s - -` | ||
68 | echo $DELS | ||
69 | echo gnunet-abd --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR --subject=$ALICE_KEY --delegate=\'$DELS\' --backward -c test_abd_lookup.conf | ||
70 | gnunet-abd --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR --subject=$ALICE_KEY --delegate="$DELS" --backward -c test_abd_lookup.conf | ||
71 | |||
72 | RES=$? | ||
73 | |||
74 | # Cleanup properly | ||
75 | gnunet-namestore -z alice -d -n "@" -t DEL -c test_abd_lookup.conf | ||
76 | gnunet-namestore -z gnu -d -n $GNU_PROJECT_ATTR -t ATTR -c test_abd_lookup.conf | ||
77 | gnunet-namestore -z gnunet -d -n $MEMBER_ATTR -t ATTR -c test_abd_lookup.conf | ||
78 | gnunet-namestore -z service -d -n $USER_ATTR -t ATTR -c test_abd_lookup.conf | ||
79 | gnunet-arm -e -c test_abd_lookup.conf | ||
80 | |||
81 | if [ "$RES" == 0 ] | ||
82 | then | ||
83 | exit 0 | ||
84 | else | ||
85 | echo "FAIL: Failed to verify credential." | ||
86 | exit 1 | ||
87 | fi | ||
diff --git a/src/abd/test_abd_verify_and.sh b/src/abd/test_abd_verify_and.sh new file mode 100755 index 000000000..c6287055e --- /dev/null +++ b/src/abd/test_abd_verify_and.sh | |||
@@ -0,0 +1,86 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | # (1) Service.user -> GNU.project.member | ||
19 | # (2) GNU.project -> GNUnet | ||
20 | # (3) GNUnet.member -> GNUnet.developer AND GNUnet.user | ||
21 | # (4) GNUnet.developer -> Alice | ||
22 | |||
23 | |||
24 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30" | ||
25 | gnunet-arm -s -c test_abd_lookup.conf | ||
26 | gnunet-identity -C service -c test_abd_lookup.conf | ||
27 | gnunet-identity -C alice -c test_abd_lookup.conf | ||
28 | gnunet-identity -C gnu -c test_abd_lookup.conf | ||
29 | gnunet-identity -C gnunet -c test_abd_lookup.conf | ||
30 | |||
31 | GNU_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep gnu | grep -v gnunet | awk '{print $3}') | ||
32 | ALICE_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep alice | awk '{print $3}') | ||
33 | GNUNET_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep gnunet | awk '{print $3}') | ||
34 | SERVICE_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep service | awk '{print $3}') | ||
35 | |||
36 | USER_ATTR="user" | ||
37 | GNU_PROJECT_ATTR="project" | ||
38 | MEMBER_ATTR="member" | ||
39 | DEVELOPER_ATTR="developer" | ||
40 | DEV_ATTR="developer" | ||
41 | |||
42 | gnunet-identity -d | ||
43 | |||
44 | # (1) A service assigns the attribute "user" to all entities that have been assigned "member" by entities that werde assigned "project" from GNU | ||
45 | gnunet-abd --createIssuerSide --ego=service --attribute="$USER_ATTR" --subject="$GNU_KEY $GNU_PROJECT_ATTR.$MEMBER_ATTR" --ttl="2019-12-12 10:00:00" -c test_abd_lookup.conf | ||
46 | gnunet-namestore -D -z service | ||
47 | |||
48 | # (2) GNU recognized GNUnet as a GNU project and delegates the "project" attribute | ||
49 | gnunet-abd --createIssuerSide --ego=gnu --attribute="$GNU_PROJECT_ATTR" --subject="$GNUNET_KEY" --ttl="2019-12-12 10:00:00" -c test_abd_lookup.conf | ||
50 | gnunet-namestore -D -z gnu | ||
51 | |||
52 | # (3+4) GNUnet assigns the attribute "member" to all entities gnunet has also assigned "developer" or "user" | ||
53 | gnunet-abd --createIssuerSide --ego=gnunet --attribute="$MEMBER_ATTR" --subject="$GNUNET_KEY $DEVELOPER_ATTR, $GNUNET_KEY $USER_ATTR" --ttl="2019-12-12 10:00:00" -c test_abd_lookup.conf | ||
54 | gnunet-namestore -D -z gnunet | ||
55 | |||
56 | # (5) GNUnet signes the delegates and Alice stores it | ||
57 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=gnunet --attribute=$DEV_ATTR --subject=$ALICE_KEY --ttl="2019-12-12 10:00:00"` | ||
58 | gnunet-abd --createSubjectSide --ego=alice --import="$SIGNED" --private | ||
59 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=gnunet --attribute=$USER_ATTR --subject=$ALICE_KEY --ttl="2019-12-12 10:00:00"` | ||
60 | gnunet-abd --createSubjectSide --ego=alice --import="$SIGNED" --private | ||
61 | gnunet-namestore -D -z alice | ||
62 | |||
63 | # Starting to resolve | ||
64 | echo "+++ Starting to Resolve +++" | ||
65 | |||
66 | DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$SERVICE_KEY --attribute=$USER_ATTR --ego=alice --backward -c test_abd_lookup.conf | paste -d, -s - -` | ||
67 | echo $DELS | ||
68 | echo gnunet-abd --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR --subject=$ALICE_KEY --delegate=\'$DELS\' --backward -c test_abd_lookup.conf | ||
69 | gnunet-abd --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR --subject=$ALICE_KEY --delegate="$DELS" --backward -c test_abd_lookup.conf | ||
70 | |||
71 | RES=$? | ||
72 | |||
73 | # Cleanup properly | ||
74 | gnunet-namestore -z alice -d -n "@" -t DEL -c test_abd_lookup.conf | ||
75 | gnunet-namestore -z gnu -d -n $GNU_PROJECT_ATTR -t ATTR -c test_abd_lookup.conf | ||
76 | gnunet-namestore -z gnunet -d -n $MEMBER_ATTR -t ATTR -c test_abd_lookup.conf | ||
77 | gnunet-namestore -z service -d -n $USER_ATTR -t ATTR -c test_abd_lookup.conf | ||
78 | gnunet-arm -e -c test_abd_lookup.conf | ||
79 | |||
80 | if [ "$RES" == 0 ] | ||
81 | then | ||
82 | exit 0 | ||
83 | else | ||
84 | echo "FAIL: Failed to verify credentials." | ||
85 | exit 1 | ||
86 | fi | ||
diff --git a/src/abd/test_abd_verify_simple.sh b/src/abd/test_abd_verify_simple.sh new file mode 100755 index 000000000..e917f8793 --- /dev/null +++ b/src/abd/test_abd_verify_simple.sh | |||
@@ -0,0 +1,56 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_abd_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_abd_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | # (1) Issuer.user -> Subject | ||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30" | ||
22 | gnunet-arm -s -c test_abd_lookup.conf | ||
23 | gnunet-identity -C testissuer -c test_abd_lookup.conf | ||
24 | gnunet-identity -C testsubject -c test_abd_lookup.conf | ||
25 | |||
26 | TEST_ATTR="user" | ||
27 | SUBJECT_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep testsubject | awk '{print $3}') | ||
28 | ISSUER_KEY=$(gnunet-identity -d -c test_abd_lookup.conf | grep testissuer | awk '{print $3}') | ||
29 | |||
30 | gnunet-identity -d | ||
31 | |||
32 | # Create delegate (1) | ||
33 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=testissuer --attribute=$TEST_ATTR --subject=$SUBJECT_KEY --ttl="2019-12-12 10:00:00" -c test_abd_lookup.conf` | ||
34 | gnunet-abd --createSubjectSide --ego=testsubject --import="$SIGNED" --private | ||
35 | gnunet-namestore -D -z testsubject | ||
36 | |||
37 | # Starting to resolve | ||
38 | echo "+++ Starting to Resolve +++" | ||
39 | |||
40 | DELS=`$DO_TIMEOUT gnunet-abd --collect --issuer=$ISSUER_KEY --attribute=$TEST_ATTR --ego=testsubject -c test_abd_lookup.conf | paste -d, -s - -` | ||
41 | echo $DELS | ||
42 | gnunet-abd --verify --issuer=$ISSUER_KEY --attribute=$TEST_ATTR --subject=$SUBJECT_KEY --delegate="$DELS" -c test_abd_lookup.conf | ||
43 | |||
44 | RES=$? | ||
45 | |||
46 | # Cleanup properly | ||
47 | gnunet-namestore -z testsubject -d -n "@" -t DEL -c test_abd_lookup.conf | ||
48 | gnunet-arm -e -c test_abd_lookup.conf | ||
49 | |||
50 | if [ "$RES" == 0 ] | ||
51 | then | ||
52 | exit 0 | ||
53 | else | ||
54 | echo "FAIL: Failed to verify credential." | ||
55 | exit 1 | ||
56 | fi \ No newline at end of file | ||
diff --git a/src/credential/test_credential_collect.sh b/src/abd/test_credential_collect.sh index 0ae063eda..0ae063eda 100755 --- a/src/credential/test_credential_collect.sh +++ b/src/abd/test_credential_collect.sh | |||
diff --git a/src/credential/test_credential_collect_rest.sh b/src/abd/test_credential_collect_rest.sh index fe59d9399..fe59d9399 100755 --- a/src/credential/test_credential_collect_rest.sh +++ b/src/abd/test_credential_collect_rest.sh | |||
diff --git a/src/credential/test_credential_issue_rest.sh b/src/abd/test_credential_issue_rest.sh index c518c08ec..c518c08ec 100755 --- a/src/credential/test_credential_issue_rest.sh +++ b/src/abd/test_credential_issue_rest.sh | |||
diff --git a/src/credential/test_credential_verify_rest.sh b/src/abd/test_credential_verify_rest.sh index 99db5da8a..99db5da8a 100755 --- a/src/credential/test_credential_verify_rest.sh +++ b/src/abd/test_credential_verify_rest.sh | |||
diff --git a/src/credential/credential.conf.in b/src/credential/credential.conf.in deleted file mode 100644 index d5a0b1c88..000000000 --- a/src/credential/credential.conf.in +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | [credential] | ||
2 | BINARY = gnunet-service-credential | ||
3 | UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-credential.sock | ||
4 | RUN_PER_USER = YES | ||
5 | OPTIONS = -L DEBUG | ||
diff --git a/src/credential/test_credential_bi_and.sh b/src/credential/test_credential_bi_and.sh deleted file mode 100755 index d52fb5dbe..000000000 --- a/src/credential/test_credential_bi_and.sh +++ /dev/null | |||
@@ -1,98 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_credential_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_credential_lookup.conf | ||
25 | gnunet-identity -C b -c test_credential_lookup.conf | ||
26 | gnunet-identity -C c -c test_credential_lookup.conf | ||
27 | gnunet-identity -C d -c test_credential_lookup.conf | ||
28 | gnunet-identity -C e -c test_credential_lookup.conf | ||
29 | gnunet-identity -C f -c test_credential_lookup.conf | ||
30 | gnunet-identity -C g -c test_credential_lookup.conf | ||
31 | gnunet-identity -C h -c test_credential_lookup.conf | ||
32 | AKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep a | awk '{print $3}') | ||
33 | BKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep b | awk '{print $3}') | ||
34 | CKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep c | awk '{print $3}') | ||
35 | DKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep d | awk '{print $3}') | ||
36 | EKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep e | awk '{print $3}') | ||
37 | FKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep f | awk '{print $3}') | ||
38 | GKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep g | awk '{print $3}') | ||
39 | HKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep h | awk '{print $3}') | ||
40 | gnunet-identity -d | ||
41 | |||
42 | # (1) (A.a) <- B.b | ||
43 | # (2) (B.b) <- C.c AND G.g | ||
44 | # (3) C.c <- (D.D) | ||
45 | # (4) D.d <- (E.e) | ||
46 | # (5) E.e <- (F) priv | ||
47 | # (6) (G.g) <- H.h | ||
48 | # (7) H.h <- (F) priv | ||
49 | |||
50 | # BIDIRECTIONAL | ||
51 | gnunet-credential --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_credential_lookup.conf | ||
52 | gnunet-namestore -D -z a | ||
53 | gnunet-credential --createIssuerSide --ego=b --attribute="b" --subject="$CKEY c, $GKEY g" --ttl=5m -c test_credential_lookup.conf | ||
54 | gnunet-namestore -D -z b | ||
55 | gnunet-credential --createIssuerSide --ego=g --attribute="g" --subject="$HKEY h" --ttl=5m -c test_credential_lookup.conf | ||
56 | gnunet-namestore -D -z b | ||
57 | |||
58 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
59 | gnunet-credential --createSubjectSide --ego=d --import="$SIGNED" | ||
60 | gnunet-namestore -D -z d | ||
61 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
62 | gnunet-credential --createSubjectSide --ego=e --import="$SIGNED" | ||
63 | gnunet-namestore -D -z e | ||
64 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=e --attribute="e" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
65 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" --private | ||
66 | gnunet-namestore -D -z f | ||
67 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=h --attribute="h" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
68 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" --private | ||
69 | gnunet-namestore -D -z h | ||
70 | |||
71 | # Starting to resolve | ||
72 | echo "+++ Starting to Resolve +++" | ||
73 | |||
74 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" --ego=f --forward --backward -c test_credential_lookup.conf | paste -d, -s - -` | ||
75 | echo $DELS | ||
76 | echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' --forward --backward -c test_credential_lookup.conf | ||
77 | gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" --forward --backward -c test_credential_lookup.conf | ||
78 | |||
79 | RES=$? | ||
80 | |||
81 | # Cleanup properly | ||
82 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf | ||
83 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_credential_lookup.conf | ||
84 | gnunet-namestore -z g -d -n "g" -t ATTR -c test_credential_lookup.conf | ||
85 | gnunet-namestore -z d -d -n "@" -t DEL -c test_credential_lookup.conf | ||
86 | gnunet-namestore -z e -d -n "@" -t DEL -c test_credential_lookup.conf | ||
87 | gnunet-namestore -z f -d -n "@" -t DEL -c test_credential_lookup.conf | ||
88 | |||
89 | gnunet-arm -e -c test_credential_lookup.conf | ||
90 | |||
91 | if [ "$RES" == 0 ] | ||
92 | then | ||
93 | exit 0 | ||
94 | else | ||
95 | echo "FAIL: Failed to verify credential." | ||
96 | exit 1 | ||
97 | fi | ||
98 | |||
diff --git a/src/credential/test_credential_bi_and2.sh b/src/credential/test_credential_bi_and2.sh deleted file mode 100755 index f076c1c5c..000000000 --- a/src/credential/test_credential_bi_and2.sh +++ /dev/null | |||
@@ -1,94 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_credential_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_credential_lookup.conf | ||
25 | gnunet-identity -C b -c test_credential_lookup.conf | ||
26 | gnunet-identity -C c -c test_credential_lookup.conf | ||
27 | gnunet-identity -C d -c test_credential_lookup.conf | ||
28 | gnunet-identity -C e -c test_credential_lookup.conf | ||
29 | gnunet-identity -C f -c test_credential_lookup.conf | ||
30 | gnunet-identity -C g -c test_credential_lookup.conf | ||
31 | gnunet-identity -C h -c test_credential_lookup.conf | ||
32 | AKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep a | awk '{print $3}') | ||
33 | BKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep b | awk '{print $3}') | ||
34 | CKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep c | awk '{print $3}') | ||
35 | DKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep d | awk '{print $3}') | ||
36 | EKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep e | awk '{print $3}') | ||
37 | FKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep f | awk '{print $3}') | ||
38 | GKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep g | awk '{print $3}') | ||
39 | HKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep h | awk '{print $3}') | ||
40 | gnunet-identity -d | ||
41 | |||
42 | # (1) (A.a) <- B.b | ||
43 | # (2) (B.b) <- C.c AND G.g | ||
44 | # (3) C.c <- (D.D) | ||
45 | # (4) D.d <- (E.e) | ||
46 | # (5) E.e <- (F) priv | ||
47 | # (6) G.g <- (F) priv | ||
48 | |||
49 | # BIDIRECTIONAL | ||
50 | gnunet-credential --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_credential_lookup.conf | ||
51 | gnunet-namestore -D -z a | ||
52 | gnunet-credential --createIssuerSide --ego=b --attribute="b" --subject="$CKEY c, $GKEY g" --ttl=5m -c test_credential_lookup.conf | ||
53 | gnunet-namestore -D -z b | ||
54 | |||
55 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
56 | gnunet-credential --createSubjectSide --ego=d --import="$SIGNED" | ||
57 | gnunet-namestore -D -z d | ||
58 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
59 | gnunet-credential --createSubjectSide --ego=e --import="$SIGNED" | ||
60 | gnunet-namestore -D -z e | ||
61 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=e --attribute="e" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
62 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" --private | ||
63 | gnunet-namestore -D -z f | ||
64 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=g --attribute="g" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
65 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" --private | ||
66 | gnunet-namestore -D -z h | ||
67 | |||
68 | # Starting to resolve | ||
69 | echo "+++ Starting to Resolve +++" | ||
70 | |||
71 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" --ego=f -c test_credential_lookup.conf | paste -d, -s - -` | ||
72 | echo $DELS | ||
73 | echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' -c test_credential_lookup.conf | ||
74 | gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" -c test_credential_lookup.conf | ||
75 | |||
76 | RES=$? | ||
77 | |||
78 | # Cleanup properly | ||
79 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf | ||
80 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_credential_lookup.conf | ||
81 | gnunet-namestore -z d -d -n "@" -t DEL -c test_credential_lookup.conf | ||
82 | gnunet-namestore -z e -d -n "@" -t DEL -c test_credential_lookup.conf | ||
83 | gnunet-namestore -z f -d -n "@" -t DEL -c test_credential_lookup.conf | ||
84 | |||
85 | gnunet-arm -e -c test_credential_lookup.conf | ||
86 | |||
87 | if [ "$RES" == 0 ] | ||
88 | then | ||
89 | exit 0 | ||
90 | else | ||
91 | echo "FAIL: Failed to verify credential." | ||
92 | exit 1 | ||
93 | fi | ||
94 | |||
diff --git a/src/credential/test_credential_bi_and3.sh b/src/credential/test_credential_bi_and3.sh deleted file mode 100755 index 80dddcc14..000000000 --- a/src/credential/test_credential_bi_and3.sh +++ /dev/null | |||
@@ -1,96 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
21 | gnunet-arm -s -c test_credential_lookup.conf | ||
22 | |||
23 | gnunet-identity -C a -c test_credential_lookup.conf | ||
24 | gnunet-identity -C b -c test_credential_lookup.conf | ||
25 | gnunet-identity -C c -c test_credential_lookup.conf | ||
26 | gnunet-identity -C d -c test_credential_lookup.conf | ||
27 | gnunet-identity -C e -c test_credential_lookup.conf | ||
28 | gnunet-identity -C f -c test_credential_lookup.conf | ||
29 | gnunet-identity -C g -c test_credential_lookup.conf | ||
30 | gnunet-identity -C h -c test_credential_lookup.conf | ||
31 | AKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep a | awk '{print $3}') | ||
32 | BKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep b | awk '{print $3}') | ||
33 | CKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep c | awk '{print $3}') | ||
34 | DKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep d | awk '{print $3}') | ||
35 | EKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep e | awk '{print $3}') | ||
36 | FKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep f | awk '{print $3}') | ||
37 | GKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep g | awk '{print $3}') | ||
38 | HKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep h | awk '{print $3}') | ||
39 | gnunet-identity -d | ||
40 | |||
41 | # (1) (A.a) <- B.b | ||
42 | # (2) (B.b) <- C.c AND G.g | ||
43 | # (3) C.c <- (D.d) | ||
44 | # (4) D.d <- (E.e) | ||
45 | # (5) E.e <- (F) priv | ||
46 | # (6) G.g <- (H.h) | ||
47 | # (7) H.h <- (F) priv | ||
48 | |||
49 | # BIDIRECTIONAL | ||
50 | gnunet-credential --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_credential_lookup.conf | ||
51 | gnunet-namestore -D -z a | ||
52 | gnunet-credential --createIssuerSide --ego=b --attribute="b" --subject="$CKEY c, $GKEY g" --ttl=5m -c test_credential_lookup.conf | ||
53 | gnunet-namestore -D -z b | ||
54 | |||
55 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
56 | gnunet-credential --createSubjectSide --ego=d --import="$SIGNED" | ||
57 | gnunet-namestore -D -z d | ||
58 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
59 | gnunet-credential --createSubjectSide --ego=e --import="$SIGNED" | ||
60 | gnunet-namestore -D -z e | ||
61 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=g --attribute="g" --subject="$HKEY h" --ttl="2019-12-12 10:00:00"` | ||
62 | gnunet-credential --createSubjectSide --ego=h --import="$SIGNED" | ||
63 | gnunet-namestore -D -z h | ||
64 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=e --attribute="e" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
65 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" --private | ||
66 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=h --attribute="h" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
67 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" --private | ||
68 | gnunet-namestore -D -z f | ||
69 | |||
70 | # Starting to resolve | ||
71 | echo "+++ Starting to Resolve +++" | ||
72 | |||
73 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" --ego=f -c test_credential_lookup.conf | paste -d, -s - -` | ||
74 | echo $DELS | ||
75 | echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' -c test_credential_lookup.conf | ||
76 | gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" -c test_credential_lookup.conf | ||
77 | |||
78 | RES=$? | ||
79 | |||
80 | # Cleanup properly | ||
81 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf | ||
82 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_credential_lookup.conf | ||
83 | gnunet-namestore -z d -d -n "@" -t DEL -c test_credential_lookup.conf | ||
84 | gnunet-namestore -z e -d -n "@" -t DEL -c test_credential_lookup.conf | ||
85 | gnunet-namestore -z f -d -n "@" -t DEL -c test_credential_lookup.conf | ||
86 | gnunet-namestore -z h -d -n "@" -t DEL -c test_credential_lookup.conf | ||
87 | |||
88 | gnunet-arm -e -c test_credential_lookup.conf | ||
89 | |||
90 | if [ "$RES" == 0 ] | ||
91 | then | ||
92 | exit 0 | ||
93 | else | ||
94 | echo "FAIL: Failed to verify credential." | ||
95 | exit 1 | ||
96 | fi | ||
diff --git a/src/credential/test_credential_bi_and4.sh b/src/credential/test_credential_bi_and4.sh deleted file mode 100755 index 18731d5d1..000000000 --- a/src/credential/test_credential_bi_and4.sh +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_credential_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_credential_lookup.conf | ||
25 | gnunet-identity -C b -c test_credential_lookup.conf | ||
26 | gnunet-identity -C c -c test_credential_lookup.conf | ||
27 | gnunet-identity -C d -c test_credential_lookup.conf | ||
28 | gnunet-identity -C e -c test_credential_lookup.conf | ||
29 | gnunet-identity -C f -c test_credential_lookup.conf | ||
30 | gnunet-identity -C g -c test_credential_lookup.conf | ||
31 | gnunet-identity -C h -c test_credential_lookup.conf | ||
32 | AKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep a | awk '{print $3}') | ||
33 | BKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep b | awk '{print $3}') | ||
34 | CKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep c | awk '{print $3}') | ||
35 | DKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep d | awk '{print $3}') | ||
36 | EKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep e | awk '{print $3}') | ||
37 | FKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep f | awk '{print $3}') | ||
38 | GKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep g | awk '{print $3}') | ||
39 | HKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep h | awk '{print $3}') | ||
40 | gnunet-identity -d | ||
41 | |||
42 | # (1) (A.a) <- B.b | ||
43 | # (2) (B.b) <- C.c AND G.g | ||
44 | # (3) C.c <- (F) priv | ||
45 | # (4) G.g <- (F) priv | ||
46 | |||
47 | # BIDIRECTIONAL | ||
48 | gnunet-credential --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_credential_lookup.conf | ||
49 | gnunet-namestore -D -z a | ||
50 | gnunet-credential --createIssuerSide --ego=b --attribute="b" --subject="$CKEY c, $GKEY g" --ttl=5m -c test_credential_lookup.conf | ||
51 | gnunet-namestore -D -z b | ||
52 | |||
53 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=g --attribute="g" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
54 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" --private | ||
55 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=c --attribute="c" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
56 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" --private | ||
57 | gnunet-namestore -D -z f | ||
58 | |||
59 | # Starting to resolve | ||
60 | echo "+++ Starting to Resolve +++" | ||
61 | |||
62 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" --ego=f --backward -c test_credential_lookup.conf | paste -d, -s - -` | ||
63 | echo $DELS | ||
64 | echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' --backward -c test_credential_lookup.conf | ||
65 | gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" --backward -c test_credential_lookup.conf | ||
66 | |||
67 | RES=$? | ||
68 | |||
69 | # Cleanup properly | ||
70 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf | ||
71 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_credential_lookup.conf | ||
72 | gnunet-namestore -z f -d -n "@" -t DEL -c test_credential_lookup.conf | ||
73 | |||
74 | gnunet-arm -e -c test_credential_lookup.conf | ||
75 | |||
76 | if [ "$RES" == 0 ] | ||
77 | then | ||
78 | exit 0 | ||
79 | else | ||
80 | echo "FAIL: Failed to verify credential." | ||
81 | exit 1 | ||
82 | fi | ||
83 | |||
diff --git a/src/credential/test_credential_bi_bw.sh b/src/credential/test_credential_bi_bw.sh deleted file mode 100755 index 618fae95f..000000000 --- a/src/credential/test_credential_bi_bw.sh +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_credential_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_credential_lookup.conf | ||
25 | gnunet-identity -C b -c test_credential_lookup.conf | ||
26 | gnunet-identity -C c -c test_credential_lookup.conf | ||
27 | gnunet-identity -C d -c test_credential_lookup.conf | ||
28 | gnunet-identity -C e -c test_credential_lookup.conf | ||
29 | gnunet-identity -C f -c test_credential_lookup.conf | ||
30 | gnunet-identity -C g -c test_credential_lookup.conf | ||
31 | AKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep a | awk '{print $3}') | ||
32 | BKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep b | awk '{print $3}') | ||
33 | CKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep c | awk '{print $3}') | ||
34 | DKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep d | awk '{print $3}') | ||
35 | EKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep e | awk '{print $3}') | ||
36 | FKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep f | awk '{print $3}') | ||
37 | GKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep g | awk '{print $3}') | ||
38 | gnunet-identity -d | ||
39 | |||
40 | # (1) (A.a) <- B.b | ||
41 | # (2) (B.b) <- C.c | ||
42 | # (3) C.c <- (D.D) | ||
43 | # (4) D.d <- (E.e) | ||
44 | # (5) E.e <- (F) | ||
45 | |||
46 | # BIDIRECTIONAL | ||
47 | gnunet-credential --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_credential_lookup.conf | ||
48 | gnunet-namestore -D -z a | ||
49 | gnunet-credential --createIssuerSide --ego=b --attribute="b" --subject="$CKEY c" --ttl=5m -c test_credential_lookup.conf | ||
50 | gnunet-namestore -D -z b | ||
51 | |||
52 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
53 | gnunet-credential --createSubjectSide --ego=d --import="$SIGNED" | ||
54 | gnunet-namestore -D -z d | ||
55 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
56 | gnunet-credential --createSubjectSide --ego=e --import="$SIGNED" | ||
57 | gnunet-namestore -D -z e | ||
58 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=e --attribute="e" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
59 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" --private | ||
60 | gnunet-namestore -D -z f | ||
61 | |||
62 | # Starting to resolve | ||
63 | echo "+++ Starting to Resolve +++" | ||
64 | |||
65 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" --ego=f --forward --backward -c test_credential_lookup.conf | paste -d, -s - -` | ||
66 | echo $DELS | ||
67 | echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' --forward --backward -c test_credential_lookup.conf | ||
68 | gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" --forward --backward -c test_credential_lookup.conf | ||
69 | |||
70 | RES=$? | ||
71 | |||
72 | # Cleanup properly | ||
73 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf | ||
74 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_credential_lookup.conf | ||
75 | gnunet-namestore -z d -d -n "@" -t DEL -c test_credential_lookup.conf | ||
76 | gnunet-namestore -z e -d -n "@" -t DEL -c test_credential_lookup.conf | ||
77 | gnunet-namestore -z f -d -n "@" -t DEL -c test_credential_lookup.conf | ||
78 | |||
79 | gnunet-arm -e -c test_credential_lookup.conf | ||
80 | |||
81 | if [ "$RES" == 0 ] | ||
82 | then | ||
83 | exit 0 | ||
84 | else | ||
85 | echo "FAIL: Failed to verify credential." | ||
86 | exit 1 | ||
87 | fi | ||
diff --git a/src/credential/test_credential_bi_bw_link.sh b/src/credential/test_credential_bi_bw_link.sh deleted file mode 100755 index f002c2141..000000000 --- a/src/credential/test_credential_bi_bw_link.sh +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_credential_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_credential_lookup.conf | ||
25 | gnunet-identity -C b -c test_credential_lookup.conf | ||
26 | gnunet-identity -C c -c test_credential_lookup.conf | ||
27 | gnunet-identity -C d -c test_credential_lookup.conf | ||
28 | gnunet-identity -C e -c test_credential_lookup.conf | ||
29 | gnunet-identity -C f -c test_credential_lookup.conf | ||
30 | gnunet-identity -C g -c test_credential_lookup.conf | ||
31 | AKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep a | awk '{print $3}') | ||
32 | BKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep b | awk '{print $3}') | ||
33 | CKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep c | awk '{print $3}') | ||
34 | DKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep d | awk '{print $3}') | ||
35 | EKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep e | awk '{print $3}') | ||
36 | FKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep f | awk '{print $3}') | ||
37 | GKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep g | awk '{print $3}') | ||
38 | gnunet-identity -d | ||
39 | |||
40 | # (1) (A.a) <- B.b | ||
41 | # (2) (B.b) <- G.g.c | ||
42 | # (3) (G.g) <- C | ||
43 | # (3) C.c <- (D.D) | ||
44 | # (4) D.d <- (E.e) | ||
45 | # (5) E.e <- (F) | ||
46 | |||
47 | # BIDIRECTIONAL | ||
48 | gnunet-credential --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_credential_lookup.conf | ||
49 | gnunet-namestore -D -z a | ||
50 | gnunet-credential --createIssuerSide --ego=b --attribute="b" --subject="$GKEY g.c" --ttl=5m -c test_credential_lookup.conf | ||
51 | gnunet-namestore -D -z b | ||
52 | gnunet-credential --createIssuerSide --ego=g --attribute="g" --subject="$CKEY" --ttl=5m -c test_credential_lookup.conf | ||
53 | gnunet-namestore -D -z b | ||
54 | |||
55 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
56 | gnunet-credential --createSubjectSide --ego=d --import="$SIGNED" | ||
57 | gnunet-namestore -D -z d | ||
58 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
59 | gnunet-credential --createSubjectSide --ego=e --import="$SIGNED" | ||
60 | gnunet-namestore -D -z e | ||
61 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=e --attribute="e" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
62 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" --private | ||
63 | gnunet-namestore -D -z f | ||
64 | |||
65 | # Starting to resolve | ||
66 | echo "+++ Starting to Resolve +++" | ||
67 | |||
68 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" --ego=f --forward --backward -c test_credential_lookup.conf | paste -d, -s - -` | ||
69 | echo $DELS | ||
70 | echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' --forward --backward -c test_credential_lookup.conf | ||
71 | gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" --forward --backward -c test_credential_lookup.conf | ||
72 | |||
73 | RES=$? | ||
74 | |||
75 | # Cleanup properly | ||
76 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf | ||
77 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_credential_lookup.conf | ||
78 | gnunet-namestore -z g -d -n "g" -t ATTR -c test_credential_lookup.conf | ||
79 | gnunet-namestore -z d -d -n "@" -t DEL -c test_credential_lookup.conf | ||
80 | gnunet-namestore -z e -d -n "@" -t DEL -c test_credential_lookup.conf | ||
81 | gnunet-namestore -z f -d -n "@" -t DEL -c test_credential_lookup.conf | ||
82 | |||
83 | gnunet-arm -e -c test_credential_lookup.conf | ||
84 | |||
85 | if [ "$RES" == 0 ] | ||
86 | then | ||
87 | exit 0 | ||
88 | else | ||
89 | echo "FAIL: Failed to verify credential." | ||
90 | exit 1 | ||
91 | fi | ||
92 | |||
diff --git a/src/credential/test_credential_bi_bw_link2.sh b/src/credential/test_credential_bi_bw_link2.sh deleted file mode 100755 index f6055a7bb..000000000 --- a/src/credential/test_credential_bi_bw_link2.sh +++ /dev/null | |||
@@ -1,93 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_credential_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_credential_lookup.conf | ||
25 | gnunet-identity -C b -c test_credential_lookup.conf | ||
26 | gnunet-identity -C c -c test_credential_lookup.conf | ||
27 | gnunet-identity -C d -c test_credential_lookup.conf | ||
28 | gnunet-identity -C e -c test_credential_lookup.conf | ||
29 | gnunet-identity -C f -c test_credential_lookup.conf | ||
30 | gnunet-identity -C g -c test_credential_lookup.conf | ||
31 | AKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep a | awk '{print $3}') | ||
32 | BKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep b | awk '{print $3}') | ||
33 | CKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep c | awk '{print $3}') | ||
34 | DKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep d | awk '{print $3}') | ||
35 | EKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep e | awk '{print $3}') | ||
36 | FKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep f | awk '{print $3}') | ||
37 | GKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep g | awk '{print $3}') | ||
38 | gnunet-identity -d | ||
39 | |||
40 | # (1) (A.a) <- B.b | ||
41 | # (2) (B.b) <- G.g.c | ||
42 | # (3) G.g <- (C) | ||
43 | # (3) C.c <- (D.d) | ||
44 | # (4) D.d <- (E.e) | ||
45 | # (5) E.e <- (F) | ||
46 | |||
47 | # BIDIRECTIONAL | ||
48 | gnunet-credential --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_credential_lookup.conf | ||
49 | gnunet-namestore -D -z a | ||
50 | gnunet-credential --createIssuerSide --ego=b --attribute="b" --subject="$GKEY g.c" --ttl=5m -c test_credential_lookup.conf | ||
51 | gnunet-namestore -D -z b | ||
52 | |||
53 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=g --attribute="g" --subject="$CKEY" --ttl="2019-12-12 10:00:00"` | ||
54 | gnunet-credential --createSubjectSide --ego=c --import="$SIGNED" | ||
55 | gnunet-namestore -D -z c | ||
56 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
57 | gnunet-credential --createSubjectSide --ego=d --import="$SIGNED" | ||
58 | gnunet-namestore -D -z d | ||
59 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
60 | gnunet-credential --createSubjectSide --ego=e --import="$SIGNED" | ||
61 | gnunet-namestore -D -z e | ||
62 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=e --attribute="e" --subject="$FKEY" --ttl="2019-12-12 10:00:00"` | ||
63 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" --private | ||
64 | gnunet-namestore -D -z f | ||
65 | |||
66 | # Starting to resolve | ||
67 | echo "+++ Starting to Resolve +++" | ||
68 | |||
69 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" --ego=f --forward --backward -c test_credential_lookup.conf | paste -d, -s - -` | ||
70 | echo $DELS | ||
71 | echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' --forward --backward -c test_credential_lookup.conf | ||
72 | gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" --forward --backward -c test_credential_lookup.conf | ||
73 | |||
74 | RES=$? | ||
75 | |||
76 | # Cleanup properly | ||
77 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf | ||
78 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_credential_lookup.conf | ||
79 | gnunet-namestore -z c -d -n "@" -t DEL -c test_credential_lookup.conf | ||
80 | gnunet-namestore -z d -d -n "@" -t DEL -c test_credential_lookup.conf | ||
81 | gnunet-namestore -z e -d -n "@" -t DEL -c test_credential_lookup.conf | ||
82 | gnunet-namestore -z f -d -n "@" -t DEL -c test_credential_lookup.conf | ||
83 | |||
84 | gnunet-arm -e -c test_credential_lookup.conf | ||
85 | |||
86 | if [ "$RES" == 0 ] | ||
87 | then | ||
88 | exit 0 | ||
89 | else | ||
90 | echo "FAIL: Failed to verify credential." | ||
91 | exit 1 | ||
92 | fi | ||
93 | |||
diff --git a/src/credential/test_credential_bi_fw.sh b/src/credential/test_credential_bi_fw.sh deleted file mode 100755 index 7cd5e5c52..000000000 --- a/src/credential/test_credential_bi_fw.sh +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
22 | gnunet-arm -s -c test_credential_lookup.conf | ||
23 | |||
24 | gnunet-identity -C a -c test_credential_lookup.conf | ||
25 | gnunet-identity -C b -c test_credential_lookup.conf | ||
26 | gnunet-identity -C c -c test_credential_lookup.conf | ||
27 | gnunet-identity -C d -c test_credential_lookup.conf | ||
28 | gnunet-identity -C e -c test_credential_lookup.conf | ||
29 | gnunet-identity -C f -c test_credential_lookup.conf | ||
30 | gnunet-identity -C g -c test_credential_lookup.conf | ||
31 | AKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep a | awk '{print $3}') | ||
32 | BKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep b | awk '{print $3}') | ||
33 | CKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep c | awk '{print $3}') | ||
34 | DKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep d | awk '{print $3}') | ||
35 | EKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep e | awk '{print $3}') | ||
36 | FKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep f | awk '{print $3}') | ||
37 | GKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep g | awk '{print $3}') | ||
38 | gnunet-identity -d | ||
39 | |||
40 | # (1) (A.a) <- B.b | ||
41 | # (2) (B.b) <- C.c | ||
42 | # (3) C.c <- (D.D) | ||
43 | # (4) D.d <- (E.e) | ||
44 | # (5) E.e <- (F.f) | ||
45 | # (6) F.f <- (G) | ||
46 | |||
47 | # BIDIRECTIONAL | ||
48 | gnunet-credential --createIssuerSide --ego=a --attribute="a" --subject="$BKEY b" --ttl=5m -c test_credential_lookup.conf | ||
49 | gnunet-namestore -D -z a | ||
50 | gnunet-credential --createIssuerSide --ego=b --attribute="b" --subject="$CKEY c" --ttl=5m -c test_credential_lookup.conf | ||
51 | gnunet-namestore -D -z b | ||
52 | |||
53 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=c --attribute="c" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
54 | gnunet-credential --createSubjectSide --ego=d --import="$SIGNED" | ||
55 | gnunet-namestore -D -z d | ||
56 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=d --attribute="d" --subject="$EKEY e" --ttl="2019-12-12 10:00:00"` | ||
57 | gnunet-credential --createSubjectSide --ego=e --import="$SIGNED" | ||
58 | gnunet-namestore -D -z e | ||
59 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=e --attribute="e" --subject="$FKEY f" --ttl="2019-12-12 10:00:00"` | ||
60 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" | ||
61 | gnunet-namestore -D -z f | ||
62 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=f --attribute="f" --subject="$GKEY" --ttl="2019-12-12 10:00:00"` | ||
63 | gnunet-credential --createSubjectSide --ego=g --import="$SIGNED" --private | ||
64 | gnunet-namestore -D -z g | ||
65 | |||
66 | # Starting to resolve | ||
67 | echo "+++ Starting to Resolve +++" | ||
68 | |||
69 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" --ego=g --forward --backward -c test_credential_lookup.conf | paste -d, -s - -` | ||
70 | echo $DELS | ||
71 | echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$GKEY --delegate=\'$DELS\' --forward --backward -c test_credential_lookup.conf | ||
72 | gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$GKEY --delegate="$DELS" --forward --backward -c test_credential_lookup.conf | ||
73 | |||
74 | RES=$? | ||
75 | |||
76 | # Cleanup properly | ||
77 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf | ||
78 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_credential_lookup.conf | ||
79 | gnunet-namestore -z d -d -n "@" -t DEL -c test_credential_lookup.conf | ||
80 | gnunet-namestore -z e -d -n "@" -t DEL -c test_credential_lookup.conf | ||
81 | gnunet-namestore -z f -d -n "@" -t DEL -c test_credential_lookup.conf | ||
82 | gnunet-namestore -z g -d -n "@" -t DEL -c test_credential_lookup.conf | ||
83 | |||
84 | gnunet-arm -e -c test_credential_lookup.conf | ||
85 | |||
86 | if [ "$RES" == 0 ] | ||
87 | then | ||
88 | exit 0 | ||
89 | else | ||
90 | echo "FAIL: Failed to verify credential." | ||
91 | exit 1 | ||
92 | fi | ||
diff --git a/src/credential/test_credential_issue.sh b/src/credential/test_credential_issue.sh deleted file mode 100755 index 3d4b82cf6..000000000 --- a/src/credential/test_credential_issue.sh +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | # (1) PKEY1.user -> PKEY2.resu.user | ||
19 | # (2) PKEY2.resu -> PKEY3 | ||
20 | # (3) PKEY3.user -> PKEY4 | ||
21 | |||
22 | |||
23 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30" | ||
24 | |||
25 | TEST_ATTR="test" | ||
26 | gnunet-arm -s -c test_credential_lookup.conf | ||
27 | gnunet-identity -C testissuer -c test_credential_lookup.conf | ||
28 | gnunet-identity -C testsubject -c test_credential_lookup.conf | ||
29 | SUBJECT_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep testsubject | awk '{print $3}') | ||
30 | ISSUER_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep testissuer | awk '{print $3}') | ||
31 | |||
32 | # Get credential and store it with subject (3) | ||
33 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=testissuer --attribute=$TEST_ATTR --subject=$SUBJECT_KEY --ttl="2019-12-12 10:00:00" -c test_credential_lookup.conf` | ||
34 | |||
35 | STATUS=$? | ||
36 | |||
37 | if test $? != 0 | ||
38 | then | ||
39 | echo "Error issuing..." | ||
40 | exit 1 | ||
41 | fi | ||
42 | #Try import | ||
43 | $DO_TIMEOUT gnunet-credential --createSubjectSide --ego=testsubject --import="$SIGNED" --private -c test_credential_lookup.conf | ||
44 | RES=$? | ||
45 | gnunet-arm -e -c test_credential_lookup.conf | ||
46 | exit $RES | ||
diff --git a/src/credential/test_credential_own.sh b/src/credential/test_credential_own.sh deleted file mode 100755 index 8a94f90e7..000000000 --- a/src/credential/test_credential_own.sh +++ /dev/null | |||
@@ -1,140 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | |||
19 | |||
20 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10" | ||
21 | gnunet-arm -s -c test_credential_lookup.conf | ||
22 | |||
23 | gnunet-identity -C a -c test_credential_lookup.conf | ||
24 | gnunet-identity -C d -c test_credential_lookup.conf | ||
25 | gnunet-identity -C e -c test_credential_lookup.conf | ||
26 | gnunet-identity -C f -c test_credential_lookup.conf | ||
27 | gnunet-identity -C g -c test_credential_lookup.conf | ||
28 | AKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep a | awk '{print $3}') | ||
29 | DKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep d | awk '{print $3}') | ||
30 | EKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep e | awk '{print $3}') | ||
31 | FKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep f | awk '{print $3}') | ||
32 | GKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep g | awk '{print $3}') | ||
33 | |||
34 | ############################################################################################ | ||
35 | # (1) EPub.discount <- EOrg.preferred | ||
36 | # (2) EOrg.preferred <- StateU.student | ||
37 | # (3) StateU.student <- RegistrarB.student | ||
38 | # (4) RegistrarB.student <- Alice | ||
39 | |||
40 | gnunet-identity -C epub -c test_credential_lookup.conf | ||
41 | gnunet-identity -C eorg -c test_credential_lookup.conf | ||
42 | gnunet-identity -C stateu -c test_credential_lookup.conf | ||
43 | gnunet-identity -C registrarb -c test_credential_lookup.conf | ||
44 | gnunet-identity -C alice -c test_credential_lookup.conf | ||
45 | |||
46 | EPUB_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep epub | awk '{print $3}') | ||
47 | EORG_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep eorg | awk '{print $3}') | ||
48 | STATEU_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep stateu | awk '{print $3}') | ||
49 | REGISTRARB_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep registrarb | awk '{print $3}') | ||
50 | ALICE_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep alice | awk '{print $3}') | ||
51 | |||
52 | |||
53 | DISC_ATTR="discount" | ||
54 | PREF_ATTR="preferred" | ||
55 | STATE_STUD_ATTR="student" | ||
56 | REG_STUD_ATTR="student" | ||
57 | END_ATTR="end" | ||
58 | |||
59 | gnunet-identity -d | ||
60 | |||
61 | # FORWARD, subject side stored (different constallations) | ||
62 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=a --attribute="a" --subject="$AKEY b.c" --ttl="2019-12-12 10:00:00"` | ||
63 | gnunet-credential --createSubjectSide --ego=a --import="$SIGNED" | ||
64 | gnunet-namestore -D -z a | ||
65 | |||
66 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=a --attribute="b" --subject="$DKEY d" --ttl="2019-12-12 10:00:00"` | ||
67 | gnunet-credential --createSubjectSide --ego=d --import="$SIGNED" | ||
68 | gnunet-namestore -D -z d | ||
69 | |||
70 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=d --attribute="d" --subject="$EKEY" --ttl="2019-12-12 10:00:00"` | ||
71 | gnunet-credential --createSubjectSide --ego=e --import="$SIGNED" | ||
72 | gnunet-namestore -D -z e | ||
73 | |||
74 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=e --attribute="c" --subject="$FKEY c" --ttl="2019-12-12 10:00:00"` | ||
75 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" | ||
76 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=e --attribute="k" --subject="$FKEY c.k" --ttl="2019-12-12 10:00:00"` | ||
77 | gnunet-credential --createSubjectSide --ego=f --import="$SIGNED" | ||
78 | gnunet-namestore -D -z f | ||
79 | |||
80 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=f --attribute="c" --subject="$GKEY" --ttl="2019-12-12 10:00:00"` | ||
81 | gnunet-credential --createSubjectSide --ego=g --import="$SIGNED" --private | ||
82 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=a --attribute="c" --subject="$GKEY" --ttl="2019-12-12 10:00:00"` | ||
83 | gnunet-credential --createSubjectSide --ego=g --import="$SIGNED" --private | ||
84 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=d --attribute="h.o" --subject="$GKEY" --ttl="2019-12-12 10:00:00"` | ||
85 | gnunet-credential --createSubjectSide --ego=g --import="$SIGNED" | ||
86 | gnunet-namestore -D -z g | ||
87 | |||
88 | |||
89 | # BACKWARD, issuer side stored | ||
90 | # (1) EPub assigns the attribute "discount" to all entities that have been assigned "preferred" by EOrg | ||
91 | gnunet-credential --createIssuerSide --ego=epub --attribute=$DISC_ATTR --subject="$EORG_KEY $PREF_ATTR" --ttl=5m -c test_credential_lookup.conf | ||
92 | |||
93 | # (2) EOrg assigns the attribute "preferred" to all entities that have been assigned "student" by StateU | ||
94 | gnunet-credential --createIssuerSide --ego=eorg --attribute=$PREF_ATTR --subject="$STATEU_KEY $STATE_STUD_ATTR" --ttl=5m -c test_credential_lookup.conf | ||
95 | |||
96 | # (3) StateU assigns the attribute "student" to all entities that have been asssigned "student" by RegistrarB | ||
97 | gnunet-credential --createIssuerSide --ego=stateu --attribute=$STATE_STUD_ATTR --subject="$REGISTRARB_KEY $REG_STUD_ATTR" --ttl=5m -c test_credential_lookup.conf | ||
98 | |||
99 | # (4) RegistrarB issues Alice the credential "student" | ||
100 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=registrarb --attribute="$REG_STUD_ATTR" --subject="$ALICE_KEY" --ttl="2019-12-12 10:00:00"` | ||
101 | gnunet-credential --createSubjectSide --ego=alice --import="$SIGNED" --private | ||
102 | |||
103 | # Starting to resolve | ||
104 | echo "+++ Starting to Resolve +++" | ||
105 | |||
106 | # FORWARD | ||
107 | #DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" --ego=g --forward -c test_credential_lookup.conf | paste -d, -s - -` | ||
108 | #echo $DELS | ||
109 | #echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$GKEY --delegate=\'$DELS\' --forward -c test_credential_lookup.conf | ||
110 | #RES_DELS=`gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$GKEY --delegate="$DELS" --forward -c test_credential_lookup.conf` | ||
111 | |||
112 | # BACKWARD | ||
113 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$EPUB_KEY --attribute=$DISC_ATTR --ego=alice --backward -c test_credential_lookup.conf | paste -d, -s - -` | ||
114 | echo $DELS | ||
115 | echo gnunet-credential --verify --issuer=$EPUB_KEY --attribute=$DISC_ATTR --subject=$ALICE_KEY --delegate=\'$DELS\' --backward -c test_credential_lookup.conf | ||
116 | gnunet-credential --verify --issuer=$EPUB_KEY --attribute=$DISC_ATTR --subject=$ALICE_KEY --delegate="$DELS" --backward -c test_credential_lookup.conf | ||
117 | |||
118 | RES=$? | ||
119 | |||
120 | # Cleanup properly | ||
121 | gnunet-namestore -z epub -d -n $DISC_ATTR -t ATTR -c test_credential_lookup.conf | ||
122 | gnunet-namestore -z eorg -d -n $PREF_ATTR -t ATTR -c test_credential_lookup.conf | ||
123 | gnunet-namestore -z stateu -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf | ||
124 | #gnunet-namestore -z a -d -n "@" -t DEL -c test_credential_lookup.conf | ||
125 | #gnunet-namestore -z d -d -n "@" -t DEL -c test_credential_lookup.conf | ||
126 | #gnunet-namestore -z e -d -n "@" -t DEL -c test_credential_lookup.conf | ||
127 | #gnunet-namestore -z f -d -n "@" -t DEL -c test_credential_lookup.conf | ||
128 | #gnunet-namestore -z g -d -n "@" -t DEL -c test_credential_lookup.conf | ||
129 | |||
130 | |||
131 | gnunet-arm -e -c test_credential_lookup.conf | ||
132 | |||
133 | if [ "$RES" == 0 ] | ||
134 | then | ||
135 | exit 0 | ||
136 | else | ||
137 | echo "FAIL: Failed to verify credential." | ||
138 | exit 1 | ||
139 | fi | ||
140 | |||
diff --git a/src/credential/test_credential_verify.sh b/src/credential/test_credential_verify.sh deleted file mode 100755 index 38492de8e..000000000 --- a/src/credential/test_credential_verify.sh +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | # (1) Service.user -> GNU.project.member | ||
19 | # (2) GNU.project -> GNUnet | ||
20 | # (3) GNUnet.member -> GNUnet.developer | ||
21 | # (4) GNUnet.member -> GNUnet.user | ||
22 | # (5) GNUnet.developer -> Alice | ||
23 | |||
24 | |||
25 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30" | ||
26 | gnunet-arm -s -c test_credential_lookup.conf | ||
27 | gnunet-identity -C service -c test_credential_lookup.conf | ||
28 | gnunet-identity -C alice -c test_credential_lookup.conf | ||
29 | gnunet-identity -C gnu -c test_credential_lookup.conf | ||
30 | gnunet-identity -C gnunet -c test_credential_lookup.conf | ||
31 | |||
32 | GNU_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep gnu | grep -v gnunet | awk '{print $3}') | ||
33 | ALICE_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep alice | awk '{print $3}') | ||
34 | GNUNET_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep gnunet | awk '{print $3}') | ||
35 | SERVICE_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep service | awk '{print $3}') | ||
36 | |||
37 | USER_ATTR="user" | ||
38 | GNU_PROJECT_ATTR="project" | ||
39 | MEMBER_ATTR="member" | ||
40 | DEVELOPER_ATTR="developer" | ||
41 | DEV_ATTR="developer" | ||
42 | TEST_CREDENTIAL="mygnunetcreds" | ||
43 | |||
44 | gnunet-identity -d | ||
45 | |||
46 | # (1) A service assigns the attribute "user" to all entities that have been assigned "member" by entities that werde assigned "project" from GNU | ||
47 | gnunet-credential --createIssuerSide --ego=service --attribute="$USER_ATTR" --subject="$GNU_KEY $GNU_PROJECT_ATTR.$MEMBER_ATTR" --ttl="2019-12-12 10:00:00" -c test_credential_lookup.conf | ||
48 | gnunet-namestore -D -z service | ||
49 | |||
50 | # (2) GNU recognized GNUnet as a GNU project and delegates the "project" attribute | ||
51 | gnunet-credential --createIssuerSide --ego=gnu --attribute="$GNU_PROJECT_ATTR" --subject="$GNUNET_KEY" --ttl="2019-12-12 10:00:00" -c test_credential_lookup.conf | ||
52 | gnunet-namestore -D -z gnu | ||
53 | |||
54 | # (3+4) GNUnet assigns the attribute "member" to all entities gnunet has also assigned "developer" or "user" | ||
55 | gnunet-credential --createIssuerSide --ego=gnunet --attribute="$MEMBER_ATTR" --subject="$GNUNET_KEY $DEVELOPER_ATTR" --ttl="2019-12-12 10:00:00" -c test_credential_lookup.conf | ||
56 | gnunet-credential --createIssuerSide --ego=gnunet --attribute="$MEMBER_ATTR" --subject="$GNUNET_KEY $USER_ATTR" --ttl="2019-12-12 10:00:00" -c test_credential_lookup.conf | ||
57 | gnunet-namestore -D -z gnunet | ||
58 | |||
59 | # (5) GNUnet signes the delegate and Alice stores it | ||
60 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=gnunet --attribute=$DEV_ATTR --subject=$ALICE_KEY --ttl="2019-12-12 10:00:00"` | ||
61 | gnunet-credential --createSubjectSide --ego=alice --import="$SIGNED" --private | ||
62 | gnunet-namestore -D -z alice | ||
63 | |||
64 | # Starting to resolve | ||
65 | echo "+++ Starting to Resolve +++" | ||
66 | |||
67 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$SERVICE_KEY --attribute=$USER_ATTR --ego=alice --backward -c test_credential_lookup.conf | paste -d, -s - -` | ||
68 | echo $DELS | ||
69 | echo gnunet-credential --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR --subject=$ALICE_KEY --delegate=\'$DELS\' --backward -c test_credential_lookup.conf | ||
70 | gnunet-credential --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR --subject=$ALICE_KEY --delegate="$DELS" --backward -c test_credential_lookup.conf | ||
71 | |||
72 | RES=$? | ||
73 | |||
74 | # Cleanup properly | ||
75 | gnunet-namestore -z alice -d -n "@" -t DEL -c test_credential_lookup.conf | ||
76 | gnunet-namestore -z gnu -d -n $GNU_PROJECT_ATTR -t ATTR -c test_credential_lookup.conf | ||
77 | gnunet-namestore -z gnunet -d -n $MEMBER_ATTR -t ATTR -c test_credential_lookup.conf | ||
78 | gnunet-namestore -z service -d -n $USER_ATTR -t ATTR -c test_credential_lookup.conf | ||
79 | gnunet-arm -e -c test_credential_lookup.conf | ||
80 | |||
81 | if [ "$RES" == 0 ] | ||
82 | then | ||
83 | exit 0 | ||
84 | else | ||
85 | echo "FAIL: Failed to verify credential." | ||
86 | exit 1 | ||
87 | fi | ||
diff --git a/src/credential/test_credential_verify_and.sh b/src/credential/test_credential_verify_and.sh deleted file mode 100755 index 3a2852dc6..000000000 --- a/src/credential/test_credential_verify_and.sh +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | # (1) Service.user -> GNU.project.member | ||
19 | # (2) GNU.project -> GNUnet | ||
20 | # (3) GNUnet.member -> GNUnet.developer AND GNUnet.user | ||
21 | # (4) GNUnet.developer -> Alice | ||
22 | |||
23 | |||
24 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30" | ||
25 | gnunet-arm -s -c test_credential_lookup.conf | ||
26 | gnunet-identity -C service -c test_credential_lookup.conf | ||
27 | gnunet-identity -C alice -c test_credential_lookup.conf | ||
28 | gnunet-identity -C gnu -c test_credential_lookup.conf | ||
29 | gnunet-identity -C gnunet -c test_credential_lookup.conf | ||
30 | |||
31 | GNU_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep gnu | grep -v gnunet | awk '{print $3}') | ||
32 | ALICE_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep alice | awk '{print $3}') | ||
33 | GNUNET_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep gnunet | awk '{print $3}') | ||
34 | SERVICE_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep service | awk '{print $3}') | ||
35 | |||
36 | USER_ATTR="user" | ||
37 | GNU_PROJECT_ATTR="project" | ||
38 | MEMBER_ATTR="member" | ||
39 | DEVELOPER_ATTR="developer" | ||
40 | DEV_ATTR="developer" | ||
41 | TEST_CREDENTIAL="mygnunetcreds" | ||
42 | |||
43 | gnunet-identity -d | ||
44 | |||
45 | # (1) A service assigns the attribute "user" to all entities that have been assigned "member" by entities that werde assigned "project" from GNU | ||
46 | gnunet-credential --createIssuerSide --ego=service --attribute="$USER_ATTR" --subject="$GNU_KEY $GNU_PROJECT_ATTR.$MEMBER_ATTR" --ttl="2019-12-12 10:00:00" -c test_credential_lookup.conf | ||
47 | gnunet-namestore -D -z service | ||
48 | |||
49 | # (2) GNU recognized GNUnet as a GNU project and delegates the "project" attribute | ||
50 | gnunet-credential --createIssuerSide --ego=gnu --attribute="$GNU_PROJECT_ATTR" --subject="$GNUNET_KEY" --ttl="2019-12-12 10:00:00" -c test_credential_lookup.conf | ||
51 | gnunet-namestore -D -z gnu | ||
52 | |||
53 | # (3+4) GNUnet assigns the attribute "member" to all entities gnunet has also assigned "developer" or "user" | ||
54 | gnunet-credential --createIssuerSide --ego=gnunet --attribute="$MEMBER_ATTR" --subject="$GNUNET_KEY $DEVELOPER_ATTR, $GNUNET_KEY $USER_ATTR" --ttl="2019-12-12 10:00:00" -c test_credential_lookup.conf | ||
55 | gnunet-namestore -D -z gnunet | ||
56 | |||
57 | # (5) GNUnet signes the delegates and Alice stores it | ||
58 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=gnunet --attribute=$DEV_ATTR --subject=$ALICE_KEY --ttl="2019-12-12 10:00:00"` | ||
59 | gnunet-credential --createSubjectSide --ego=alice --import="$SIGNED" --private | ||
60 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=gnunet --attribute=$USER_ATTR --subject=$ALICE_KEY --ttl="2019-12-12 10:00:00"` | ||
61 | gnunet-credential --createSubjectSide --ego=alice --import="$SIGNED" --private | ||
62 | gnunet-namestore -D -z alice | ||
63 | |||
64 | # Starting to resolve | ||
65 | echo "+++ Starting to Resolve +++" | ||
66 | |||
67 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$SERVICE_KEY --attribute=$USER_ATTR --ego=alice --backward -c test_credential_lookup.conf | paste -d, -s - -` | ||
68 | echo $DELS | ||
69 | echo gnunet-credential --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR --subject=$ALICE_KEY --delegate=\'$DELS\' --backward -c test_credential_lookup.conf | ||
70 | gnunet-credential --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR --subject=$ALICE_KEY --delegate="$DELS" --backward -c test_credential_lookup.conf | ||
71 | |||
72 | RES=$? | ||
73 | |||
74 | # Cleanup properly | ||
75 | gnunet-namestore -z alice -d -n "@" -t DEL -c test_credential_lookup.conf | ||
76 | gnunet-namestore -z gnu -d -n $GNU_PROJECT_ATTR -t ATTR -c test_credential_lookup.conf | ||
77 | gnunet-namestore -z gnunet -d -n $MEMBER_ATTR -t ATTR -c test_credential_lookup.conf | ||
78 | gnunet-namestore -z service -d -n $USER_ATTR -t ATTR -c test_credential_lookup.conf | ||
79 | gnunet-arm -e -c test_credential_lookup.conf | ||
80 | |||
81 | if [ "$RES" == 0 ] | ||
82 | then | ||
83 | exit 0 | ||
84 | else | ||
85 | echo "FAIL: Failed to verify credential $RES_CRED." | ||
86 | exit 1 | ||
87 | fi | ||
diff --git a/src/credential/test_credential_verify_simple.sh b/src/credential/test_credential_verify_simple.sh deleted file mode 100755 index 3a3b0832b..000000000 --- a/src/credential/test_credential_verify_simple.sh +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | #!/usr/bin/env bash | ||
2 | trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT | ||
3 | |||
4 | LOCATION=$(which gnunet-config) | ||
5 | if [ -z $LOCATION ] | ||
6 | then | ||
7 | LOCATION="gnunet-config" | ||
8 | fi | ||
9 | $LOCATION --version 1> /dev/null | ||
10 | if test $? != 0 | ||
11 | then | ||
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | ||
13 | exit 77 | ||
14 | fi | ||
15 | |||
16 | rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
17 | |||
18 | # (1) Issuer.user -> Subject | ||
19 | |||
20 | |||
21 | which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30" | ||
22 | gnunet-arm -s -c test_credential_lookup.conf | ||
23 | gnunet-identity -C testissuer -c test_credential_lookup.conf | ||
24 | gnunet-identity -C testsubject -c test_credential_lookup.conf | ||
25 | |||
26 | TEST_ATTR="user" | ||
27 | SUBJECT_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep testsubject | awk '{print $3}') | ||
28 | ISSUER_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep testissuer | awk '{print $3}') | ||
29 | |||
30 | gnunet-identity -d | ||
31 | |||
32 | # Create delegate (1) | ||
33 | SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=testissuer --attribute=$TEST_ATTR --subject=$SUBJECT_KEY --ttl="2019-12-12 10:00:00" -c test_credential_lookup.conf` | ||
34 | gnunet-credential --createSubjectSide --ego=testsubject --import="$SIGNED" --private | ||
35 | gnunet-namestore -D -z testsubject | ||
36 | |||
37 | # Starting to resolve | ||
38 | echo "+++ Starting to Resolve +++" | ||
39 | |||
40 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$ISSUER_KEY --attribute=$TEST_ATTR --ego=testsubject -c test_credential_lookup.conf | paste -d, -s - -` | ||
41 | echo $DELS | ||
42 | gnunet-credential --verify --issuer=$ISSUER_KEY --attribute=$TEST_ATTR --subject=$SUBJECT_KEY --delegate="$DELS" -c test_credential_lookup.conf | ||
43 | |||
44 | RES=$? | ||
45 | |||
46 | # Cleanup properly | ||
47 | gnunet-namestore -z testsubject -d -n "@" -t DEL -c test_credential_lookup.conf | ||
48 | gnunet-arm -e -c test_credential_lookup.conf | ||
49 | |||
50 | if [ "$RES" == 0 ] | ||
51 | then | ||
52 | exit 0 | ||
53 | else | ||
54 | echo "FAIL: Failed to verify credential." | ||
55 | exit 1 | ||
56 | fi \ No newline at end of file | ||
diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 9e0813425..c81f8e7d8 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am | |||
@@ -23,6 +23,7 @@ else | |||
23 | gnunetinclude_HEADERS = \ | 23 | gnunetinclude_HEADERS = \ |
24 | platform.h gettext.h \ | 24 | platform.h gettext.h \ |
25 | compat.h \ | 25 | compat.h \ |
26 | gnunet_abd_service.h \ | ||
26 | gnunet_applications.h \ | 27 | gnunet_applications.h \ |
27 | gnunet_arm_service.h \ | 28 | gnunet_arm_service.h \ |
28 | gnunet_ats_service.h \ | 29 | gnunet_ats_service.h \ |
@@ -42,7 +43,6 @@ gnunetinclude_HEADERS = \ | |||
42 | gnunet_container_lib.h \ | 43 | gnunet_container_lib.h \ |
43 | gnunet_conversation_service.h \ | 44 | gnunet_conversation_service.h \ |
44 | gnunet_core_service.h \ | 45 | gnunet_core_service.h \ |
45 | gnunet_credential_service.h \ | ||
46 | gnunet_crypto_lib.h \ | 46 | gnunet_crypto_lib.h \ |
47 | gnunet_curl_lib.h \ | 47 | gnunet_curl_lib.h \ |
48 | gnunet_datacache_lib.h \ | 48 | gnunet_datacache_lib.h \ |
diff --git a/src/include/gnunet_credential_service.h b/src/include/gnunet_abd_service.h index 325296ecc..b50ff8b86 100644 --- a/src/include/gnunet_credential_service.h +++ b/src/include/gnunet_abd_service.h | |||
@@ -24,13 +24,13 @@ | |||
24 | * @file | 24 | * @file |
25 | * API to the Credential service | 25 | * API to the Credential service |
26 | * | 26 | * |
27 | * @defgroup credential Credential service | 27 | * @defgroup abd Credential service |
28 | * Credentials | 28 | * Credentials |
29 | * | 29 | * |
30 | * @{ | 30 | * @{ |
31 | */ | 31 | */ |
32 | #ifndef GNUNET_CREDENTIAL_SERVICE_H | 32 | #ifndef GNUNET_ABD_SERVICE_H |
33 | #define GNUNET_CREDENTIAL_SERVICE_H | 33 | #define GNUNET_ABD_SERVICE_H |
34 | 34 | ||
35 | #include "gnunet_util_lib.h" | 35 | #include "gnunet_util_lib.h" |
36 | #include "gnunet_gns_service.h" | 36 | #include "gnunet_gns_service.h" |
@@ -48,26 +48,26 @@ extern "C" | |||
48 | /** | 48 | /** |
49 | * Connection to the Credential service. | 49 | * Connection to the Credential service. |
50 | */ | 50 | */ |
51 | struct GNUNET_CREDENTIAL_Handle; | 51 | struct GNUNET_ABD_Handle; |
52 | 52 | ||
53 | /** | 53 | /** |
54 | * Handle to control a lookup operation. | 54 | * Handle to control a lookup operation. |
55 | */ | 55 | */ |
56 | struct GNUNET_CREDENTIAL_Request; | 56 | struct GNUNET_ABD_Request; |
57 | 57 | ||
58 | /* | 58 | /* |
59 | * Enum used for checking whether the issuer has the authority to issue credentials or is just a subject | 59 | * Enum used for checking whether the issuer has the authority to issue credentials or is just a subject |
60 | */ | 60 | */ |
61 | enum GNUNET_CREDENTIAL_CredentialFlags { | 61 | enum GNUNET_ABD_CredentialFlags { |
62 | 62 | ||
63 | //Subject had credentials before, but have been revoked now | 63 | //Subject had credentials before, but have been revoked now |
64 | GNUNET_CREDENTIAL_FLAG_REVOKED=0, | 64 | GNUNET_ABD_FLAG_REVOKED=0, |
65 | 65 | ||
66 | //Subject flag indicates that the subject is a holder of this credential and may present it as such | 66 | //Subject flag indicates that the subject is a holder of this credential and may present it as such |
67 | GNUNET_CREDENTIAL_FLAG_SUBJECT=1, | 67 | GNUNET_ABD_FLAG_SUBJECT=1, |
68 | 68 | ||
69 | //Issuer flag is used to signify that the subject is allowed to issue this credential and delegate issuance | 69 | //Issuer flag is used to signify that the subject is allowed to issue this credential and delegate issuance |
70 | GNUNET_CREDENTIAL_FLAG_ISSUER=2 | 70 | GNUNET_ABD_FLAG_ISSUER=2 |
71 | 71 | ||
72 | }; | 72 | }; |
73 | 73 | ||
@@ -75,7 +75,7 @@ GNUNET_NETWORK_STRUCT_BEGIN | |||
75 | /** | 75 | /** |
76 | * The attribute delegation record | 76 | * The attribute delegation record |
77 | */ | 77 | */ |
78 | struct GNUNET_CREDENTIAL_DelegationRecord { | 78 | struct GNUNET_ABD_DelegationRecord { |
79 | 79 | ||
80 | /** | 80 | /** |
81 | * Number of delegation sets in this record | 81 | * Number of delegation sets in this record |
@@ -95,7 +95,7 @@ struct GNUNET_CREDENTIAL_DelegationRecord { | |||
95 | /** | 95 | /** |
96 | * The attribute delegation record | 96 | * The attribute delegation record |
97 | */ | 97 | */ |
98 | struct GNUNET_CREDENTIAL_DelegationRecordSet { | 98 | struct GNUNET_ABD_DelegationRecordSet { |
99 | 99 | ||
100 | /** | 100 | /** |
101 | * Public key of the subject this attribute was delegated to | 101 | * Public key of the subject this attribute was delegated to |
@@ -114,7 +114,7 @@ GNUNET_NETWORK_STRUCT_END | |||
114 | /** | 114 | /** |
115 | * The attribute delegation record | 115 | * The attribute delegation record |
116 | */ | 116 | */ |
117 | struct GNUNET_CREDENTIAL_DelegationSet { | 117 | struct GNUNET_ABD_DelegationSet { |
118 | 118 | ||
119 | /** | 119 | /** |
120 | * Public key of the subject this attribute was delegated to | 120 | * Public key of the subject this attribute was delegated to |
@@ -133,7 +133,7 @@ struct GNUNET_CREDENTIAL_DelegationSet { | |||
133 | /** | 133 | /** |
134 | * A delegation | 134 | * A delegation |
135 | */ | 135 | */ |
136 | struct GNUNET_CREDENTIAL_Delegation { | 136 | struct GNUNET_ABD_Delegation { |
137 | 137 | ||
138 | /** | 138 | /** |
139 | * The issuer of the delegation | 139 | * The issuer of the delegation |
@@ -170,7 +170,7 @@ struct GNUNET_CREDENTIAL_Delegation { | |||
170 | /** | 170 | /** |
171 | * A delegate | 171 | * A delegate |
172 | */ | 172 | */ |
173 | struct GNUNET_CREDENTIAL_Delegate { | 173 | struct GNUNET_ABD_Delegate { |
174 | 174 | ||
175 | /** | 175 | /** |
176 | * The issuer of the credential | 176 | * The issuer of the credential |
@@ -217,13 +217,13 @@ struct GNUNET_CREDENTIAL_Delegate { | |||
217 | /* | 217 | /* |
218 | * Enum used for checking whether the issuer has the authority to issue credentials or is just a subject | 218 | * Enum used for checking whether the issuer has the authority to issue credentials or is just a subject |
219 | */ | 219 | */ |
220 | enum GNUNET_CREDENTIAL_AlgoDirectionFlags { | 220 | enum GNUNET_ABD_AlgoDirectionFlags { |
221 | 221 | ||
222 | //Subject had credentials before, but have been revoked now | 222 | //Subject had credentials before, but have been revoked now |
223 | GNUNET_CREDENTIAL_FLAG_FORWARD=1 << 0, | 223 | GNUNET_ABD_FLAG_FORWARD=1 << 0, |
224 | 224 | ||
225 | //Subject flag indicates that the subject is a holder of this credential and may present it as such | 225 | //Subject flag indicates that the subject is a holder of this credential and may present it as such |
226 | GNUNET_CREDENTIAL_FLAG_BACKWARD=1 << 1 | 226 | GNUNET_ABD_FLAG_BACKWARD=1 << 1 |
227 | 227 | ||
228 | }; | 228 | }; |
229 | 229 | ||
@@ -233,8 +233,8 @@ enum GNUNET_CREDENTIAL_AlgoDirectionFlags { | |||
233 | * @param cfg configuration to use | 233 | * @param cfg configuration to use |
234 | * @return handle to the Credential service, or NULL on error | 234 | * @return handle to the Credential service, or NULL on error |
235 | */ | 235 | */ |
236 | struct GNUNET_CREDENTIAL_Handle * | 236 | struct GNUNET_ABD_Handle * |
237 | GNUNET_CREDENTIAL_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); | 237 | GNUNET_ABD_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); |
238 | 238 | ||
239 | 239 | ||
240 | /** | 240 | /** |
@@ -243,7 +243,7 @@ GNUNET_CREDENTIAL_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); | |||
243 | * @param handle connection to shut down | 243 | * @param handle connection to shut down |
244 | */ | 244 | */ |
245 | void | 245 | void |
246 | GNUNET_CREDENTIAL_disconnect (struct GNUNET_CREDENTIAL_Handle *handle); | 246 | GNUNET_ABD_disconnect (struct GNUNET_ABD_Handle *handle); |
247 | 247 | ||
248 | 248 | ||
249 | /** | 249 | /** |
@@ -252,17 +252,17 @@ GNUNET_CREDENTIAL_disconnect (struct GNUNET_CREDENTIAL_Handle *handle); | |||
252 | * @param cls closure | 252 | * @param cls closure |
253 | * @param d_count the number of delegations processed | 253 | * @param d_count the number of delegations processed |
254 | * @param delegation_chain the delegations processed | 254 | * @param delegation_chain the delegations processed |
255 | * @param c_count the number of credentials found | 255 | * @param c_count the number of delegates found |
256 | * @param credential the credentials | 256 | * @param delegate the delegates |
257 | */ | 257 | */ |
258 | typedef void (*GNUNET_CREDENTIAL_CredentialResultProcessor) (void *cls, | 258 | typedef void (*GNUNET_ABD_CredentialResultProcessor) (void *cls, |
259 | unsigned int d_count, | 259 | unsigned int d_count, |
260 | struct GNUNET_CREDENTIAL_Delegation *delegation_chain, | 260 | struct GNUNET_ABD_Delegation *delegation_chain, |
261 | unsigned int c_count, | 261 | unsigned int c_count, |
262 | struct GNUNET_CREDENTIAL_Delegate *delegte); | 262 | struct GNUNET_ABD_Delegate *delegte); |
263 | 263 | ||
264 | typedef void (*GNUNET_CREDENTIAL_IntermediateResultProcessor) (void *cls, | 264 | typedef void (*GNUNET_ABD_IntermediateResultProcessor) (void *cls, |
265 | struct GNUNET_CREDENTIAL_Delegation *delegation, | 265 | struct GNUNET_ABD_Delegation *delegation, |
266 | bool is_bw); | 266 | bool is_bw); |
267 | 267 | ||
268 | /** | 268 | /** |
@@ -272,7 +272,7 @@ typedef void (*GNUNET_CREDENTIAL_IntermediateResultProcessor) (void *cls, | |||
272 | * @param success GNUNET_YES if successful | 272 | * @param success GNUNET_YES if successful |
273 | * @param result the record data that can be handed to the subject | 273 | * @param result the record data that can be handed to the subject |
274 | */ | 274 | */ |
275 | typedef void (*GNUNET_CREDENTIAL_DelegateResultProcessor) (void *cls, | 275 | typedef void (*GNUNET_ABD_DelegateResultProcessor) (void *cls, |
276 | uint32_t success); | 276 | uint32_t success); |
277 | 277 | ||
278 | /** | 278 | /** |
@@ -282,7 +282,7 @@ typedef void (*GNUNET_CREDENTIAL_DelegateResultProcessor) (void *cls, | |||
282 | * @param success GNUNET_YES if successful | 282 | * @param success GNUNET_YES if successful |
283 | * @param result the record data that can be handed to the subject | 283 | * @param result the record data that can be handed to the subject |
284 | */ | 284 | */ |
285 | typedef void (*GNUNET_CREDENTIAL_RemoveDelegateResultProcessor) (void *cls, | 285 | typedef void (*GNUNET_ABD_RemoveDelegateResultProcessor) (void *cls, |
286 | uint32_t success); | 286 | uint32_t success); |
287 | 287 | ||
288 | 288 | ||
@@ -298,34 +298,34 @@ typedef void (*GNUNET_CREDENTIAL_RemoveDelegateResultProcessor) (void *cls, | |||
298 | * @param issuer_key the issuer public key | 298 | * @param issuer_key the issuer public key |
299 | * @param issuer_attribute the issuer attribute | 299 | * @param issuer_attribute the issuer attribute |
300 | * @param subject_key the subject public key | 300 | * @param subject_key the subject public key |
301 | * @param credential_count number of credentials | 301 | * @param delegate_count number of delegates |
302 | * @param credentials the subject credentials | 302 | * @param delegates the subject delegates |
303 | * @param proc function to call on result | 303 | * @param proc function to call on result |
304 | * @param proc_cls closure for processor | 304 | * @param proc_cls closure for processor |
305 | * @return handle to the queued request | 305 | * @return handle to the queued request |
306 | */ | 306 | */ |
307 | struct GNUNET_CREDENTIAL_Request* | 307 | struct GNUNET_ABD_Request* |
308 | GNUNET_CREDENTIAL_verify (struct GNUNET_CREDENTIAL_Handle *handle, | 308 | GNUNET_ABD_verify (struct GNUNET_ABD_Handle *handle, |
309 | const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key, | 309 | const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key, |
310 | const char *issuer_attribute, | 310 | const char *issuer_attribute, |
311 | const struct GNUNET_CRYPTO_EcdsaPublicKey *subject_key, | 311 | const struct GNUNET_CRYPTO_EcdsaPublicKey *subject_key, |
312 | uint32_t credential_count, | 312 | uint32_t delegate_count, |
313 | const struct GNUNET_CREDENTIAL_Delegate *delegates, | 313 | const struct GNUNET_ABD_Delegate *delegates, |
314 | enum GNUNET_CREDENTIAL_AlgoDirectionFlags direction, | 314 | enum GNUNET_ABD_AlgoDirectionFlags direction, |
315 | GNUNET_CREDENTIAL_CredentialResultProcessor proc, | 315 | GNUNET_ABD_CredentialResultProcessor proc, |
316 | void *proc_cls, | 316 | void *proc_cls, |
317 | GNUNET_CREDENTIAL_IntermediateResultProcessor, | 317 | GNUNET_ABD_IntermediateResultProcessor, |
318 | void *proc2_cls); | 318 | void *proc2_cls); |
319 | 319 | ||
320 | struct GNUNET_CREDENTIAL_Request* | 320 | struct GNUNET_ABD_Request* |
321 | GNUNET_CREDENTIAL_collect (struct GNUNET_CREDENTIAL_Handle *handle, | 321 | GNUNET_ABD_collect (struct GNUNET_ABD_Handle *handle, |
322 | const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key, | 322 | const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key, |
323 | const char *issuer_attribute, | 323 | const char *issuer_attribute, |
324 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *subject_key, | 324 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *subject_key, |
325 | enum GNUNET_CREDENTIAL_AlgoDirectionFlags direction, | 325 | enum GNUNET_ABD_AlgoDirectionFlags direction, |
326 | GNUNET_CREDENTIAL_CredentialResultProcessor proc, | 326 | GNUNET_ABD_CredentialResultProcessor proc, |
327 | void *proc_cls, | 327 | void *proc_cls, |
328 | GNUNET_CREDENTIAL_IntermediateResultProcessor, | 328 | GNUNET_ABD_IntermediateResultProcessor, |
329 | void *proc2_cls); | 329 | void *proc2_cls); |
330 | 330 | ||
331 | /** | 331 | /** |
@@ -340,13 +340,13 @@ GNUNET_CREDENTIAL_collect (struct GNUNET_CREDENTIAL_Handle *handle, | |||
340 | * @param proc_cls the result closure context | 340 | * @param proc_cls the result closure context |
341 | * @return handle to the queued request | 341 | * @return handle to the queued request |
342 | */ | 342 | */ |
343 | struct GNUNET_CREDENTIAL_Request * | 343 | struct GNUNET_ABD_Request * |
344 | GNUNET_CREDENTIAL_add_delegation (struct GNUNET_CREDENTIAL_Handle *handle, | 344 | GNUNET_ABD_add_delegation (struct GNUNET_ABD_Handle *handle, |
345 | struct GNUNET_IDENTITY_Ego *issuer, | 345 | struct GNUNET_IDENTITY_Ego *issuer, |
346 | const char *attribute, | 346 | const char *attribute, |
347 | struct GNUNET_CRYPTO_EcdsaPublicKey *subject, | 347 | struct GNUNET_CRYPTO_EcdsaPublicKey *subject, |
348 | const char *delegated_attribute, | 348 | const char *delegated_attribute, |
349 | GNUNET_CREDENTIAL_DelegateResultProcessor proc, | 349 | GNUNET_ABD_DelegateResultProcessor proc, |
350 | void *proc_cls); | 350 | void *proc_cls); |
351 | 351 | ||
352 | /** | 352 | /** |
@@ -359,11 +359,11 @@ GNUNET_CREDENTIAL_add_delegation (struct GNUNET_CREDENTIAL_Handle *handle, | |||
359 | * @param proc_cls callback closure | 359 | * @param proc_cls callback closure |
360 | * @return handle to the queued request | 360 | * @return handle to the queued request |
361 | */ | 361 | */ |
362 | struct GNUNET_CREDENTIAL_Request * | 362 | struct GNUNET_ABD_Request * |
363 | GNUNET_CREDENTIAL_remove_delegation (struct GNUNET_CREDENTIAL_Handle *handle, | 363 | GNUNET_ABD_remove_delegation (struct GNUNET_ABD_Handle *handle, |
364 | struct GNUNET_IDENTITY_Ego *issuer, | 364 | struct GNUNET_IDENTITY_Ego *issuer, |
365 | const char *attribute, | 365 | const char *attribute, |
366 | GNUNET_CREDENTIAL_RemoveDelegateResultProcessor proc, | 366 | GNUNET_ABD_RemoveDelegateResultProcessor proc, |
367 | void *proc_cls); | 367 | void *proc_cls); |
368 | 368 | ||
369 | 369 | ||
@@ -377,8 +377,8 @@ GNUNET_CREDENTIAL_remove_delegation (struct GNUNET_CREDENTIAL_Handle *handle, | |||
377 | * @param expiration the TTL of the credential | 377 | * @param expiration the TTL of the credential |
378 | * @return handle to the queued request | 378 | * @return handle to the queued request |
379 | */ | 379 | */ |
380 | struct GNUNET_CREDENTIAL_Delegate* | 380 | struct GNUNET_ABD_Delegate* |
381 | GNUNET_CREDENTIAL_delegate_issue (const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer, | 381 | GNUNET_ABD_delegate_issue (const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer, |
382 | struct GNUNET_CRYPTO_EcdsaPublicKey *subject, | 382 | struct GNUNET_CRYPTO_EcdsaPublicKey *subject, |
383 | const char *iss_attr, | 383 | const char *iss_attr, |
384 | const char *sub_attr, | 384 | const char *sub_attr, |
@@ -391,7 +391,7 @@ GNUNET_CREDENTIAL_delegate_issue (const struct GNUNET_CRYPTO_EcdsaPrivateKey *is | |||
391 | * @param lr the lookup request to cancel | 391 | * @param lr the lookup request to cancel |
392 | */ | 392 | */ |
393 | void | 393 | void |
394 | GNUNET_CREDENTIAL_request_cancel (struct GNUNET_CREDENTIAL_Request *lr); | 394 | GNUNET_ABD_request_cancel (struct GNUNET_ABD_Request *lr); |
395 | 395 | ||
396 | 396 | ||
397 | #if 0 /* keep Emacsens' auto-indent happy */ | 397 | #if 0 /* keep Emacsens' auto-indent happy */ |
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h index ea91f9eb9..3a49d98b9 100644 --- a/src/include/gnunet_gnsrecord_lib.h +++ b/src/include/gnunet_gnsrecord_lib.h | |||
@@ -107,9 +107,8 @@ extern "C" { | |||
107 | */ | 107 | */ |
108 | 108 | ||
109 | /** | 109 | /** |
110 | * Record type for credential | 110 | * 65547 deleted, free to use |
111 | */ | 111 | */ |
112 | #define GNUNET_GNSRECORD_TYPE_CREDENTIAL 65547 | ||
113 | 112 | ||
114 | /** | 113 | /** |
115 | * Record type for policies | 114 | * Record type for policies |
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 4ca1ad47a..cd7cb50de 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h | |||
@@ -2716,17 +2716,17 @@ extern "C" { | |||
2716 | 2716 | ||
2717 | /************************************************** | 2717 | /************************************************** |
2718 | * | 2718 | * |
2719 | * CREDENTIAL MESSAGE TYPES | 2719 | * ABD MESSAGE TYPES |
2720 | */ | 2720 | */ |
2721 | #define GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY 981 | 2721 | #define GNUNET_MESSAGE_TYPE_ABD_VERIFY 981 |
2722 | 2722 | ||
2723 | #define GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY_RESULT 982 | 2723 | #define GNUNET_MESSAGE_TYPE_ABD_VERIFY_RESULT 982 |
2724 | 2724 | ||
2725 | #define GNUNET_MESSAGE_TYPE_CREDENTIAL_COLLECT 983 | 2725 | #define GNUNET_MESSAGE_TYPE_ABD_COLLECT 983 |
2726 | 2726 | ||
2727 | #define GNUNET_MESSAGE_TYPE_CREDENTIAL_COLLECT_RESULT 984 | 2727 | #define GNUNET_MESSAGE_TYPE_ABD_COLLECT_RESULT 984 |
2728 | 2728 | ||
2729 | #define GNUNET_MESSAGE_TYPE_CREDENTIAL_INTERMEDIATE_RESULT 985 | 2729 | #define GNUNET_MESSAGE_TYPE_ABD_INTERMEDIATE_RESULT 985 |
2730 | 2730 | ||
2731 | /******************************************************************************/ | 2731 | /******************************************************************************/ |
2732 | 2732 | ||