David Goulet · b3b4ffce · 55795965 · c14f77c4 · 371a62bb · 93ec0608
--- a/src/or/shared_random_state.c 0 → 100644
+++ b/src/or/shared_random_state.c 0 → 100644
+{
+ state_query(SR_STATE_ACTION_PUT, SR_STATE_OBJ_VALID_AFTER,
+             (void *) &valid_after, NULL);
+}
+
+/* Return the phase we are currently in according to our state. */
+sr_phase_t
+sr_state_get_phase(void)
+{
+ void *ptr;
+ state_query(SR_STATE_ACTION_GET, SR_STATE_OBJ_PHASE, NULL, &ptr);
+ return *(sr_phase_t *) ptr;
+}
+
+/* Return the previous SRV value from our state. Value CAN be NULL. */
+sr_srv_t *
--- a/src/or/shared_random.h
+++ b/src/or/shared_random.h
 #define SR_SRV_VALUE_BASE64_LEN \
 (((DIGEST256_LEN - 1) / 3) * 4 + 4)

+/* Assert if commit valid flag is not set. */
+#define ASSERT_COMMIT_VALID(c) tor_assert(c->valid)
--- a/src/or/shared_random.c
+++ b/src/or/shared_random.c
 char *value, digest[DIGEST_LEN];
 digest_algorithm_t alg;
 const char *rsa_identity_fpr;
 sr_commit_t *commit = NULL;

- if (smartlist_len(args) < 3) {
+ if (smartlist_len(args) < 4) {
   goto error;
 }

- /* First argument is the algorithm. */
+ /* First is the version number of the SR protocol which indicates at which
+  * version that commit was created. */
 value = smartlist_get(args, 0);
+ version = (uint32_t) tor_parse_ulong(value, 10, 1, UINT32_MAX, NULL, NULL);
+ if (version < SR_PROTO_VERSION) {
--- a/src/or/shared_random.c
+++ b/src/or/shared_random.c
            escaped(rsa_identity_fpr));
   goto error;
 }
- /* Let's make sure, for extra safety, that this fingerprint is known to
-  * us. Even though this comes from a vote, doesn't hurt to be
-  * extracareful. */
- if (trusteddirserver_get_by_v3_auth_digest(digest) == NULL) {
-   log_warn(LD_DIR, "SR: Fingerprint %s is not from a recognized "
-                    "authority. Discarding commit.",
-            escaped(rsa_identity_fpr));
-   goto error;
--- a/src/or/shared_random.c
+++ b/src/or/shared_random.c
 /* Add the invariant token. */
 memcpy(msg, SR_SRV_TOKEN, SR_SRV_TOKEN_LEN);
 offset += SR_SRV_TOKEN_LEN;
- set_uint8(msg + offset, reveal_num);
+ set_uint64(msg + offset, reveal_num);
 offset += 1;
--- a/src/or/shared_random.c
+++ b/src/or/shared_random.c
 /* Add the invariant token. */
 memcpy(msg, SR_SRV_TOKEN, SR_SRV_TOKEN_LEN);
 offset += SR_SRV_TOKEN_LEN;
- set_uint8(msg + offset, reveal_num);
+ set_uint64(msg + offset, reveal_num);
 offset += 1;
- set_uint8(msg + offset, SR_PROTO_VERSION);
+ set_uint32(msg + offset, SR_PROTO_VERSION);
 offset += 1;
--- a/src/or/shared_random.h
+++ b/src/or/shared_random.h
 (((DIGEST256_LEN - 1) / 3) * 4 + 4)

 /* Assert if commit valid flag is not set. */
-#define ASSERT_COMMIT_VALID(c) tor_assert(c->valid)
+#define ASSERT_COMMIT_VALID(c) (tor_assert(c->valid))
--- a/src/test/test_shared_random.c
+++ b/src/test/test_shared_random.c
 const sr_srv_t *current_srv = NULL;

 #define SRV_TEST_VECTOR \
- "C3E2E6F48E541F8CB47DAC097050D09ED0AFE0CAC52AF129FCD3D20166B70463"
+ "F3946A6AED72BA529527A52D65C9E8A2C2E34C2E59974F3BD4F9DC409ACC5905"