nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

r12605@catbus: nickm | 2007-04-30 21:10:48 -0400

Browse Source 
Add an expiry date to key certificates.


svn:r10079
This commit is contained in:
Nick Mathewson 2007-05-01 01:10:50 +00:00
parent fd95ceb781
commit bbd4ef1cd1
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/spec/proposals/103-multilevel-keys.txt
View File

@ -118,6 +118,7 @@ Extensions to Proposal 101.
"dir-identity-key": The long-term identity key for this authority. "dir-identity-key": The long-term identity key for this authority.
"dir-key-published": The time when this directory's signing key was "dir-key-published": The time when this directory's signing key was
last changed. last changed.
"dir-key-expires": A time after which this key is no longer valid.
"dir-signing-key": As in proposal 101. "dir-signing-key": As in proposal 101.
"dir-key-certification": A signature of the above fields, in order. "dir-key-certification": A signature of the above fields, in order.
The signed material extends from the beginning of The signed material extends from the beginning of

22
src/tools/tor-gencert.c
View File

@ -29,12 +29,14 @@
#define IDENTITY_KEY_BITS 3072 #define IDENTITY_KEY_BITS 3072
#define SIGNING_KEY_BITS 1024 #define SIGNING_KEY_BITS 1024
#define DEFAULT_LIFETIME 12
char *identity_key_file = NULL; char *identity_key_file = NULL;
char *signing_key_file = NULL; char *signing_key_file = NULL;
char *certificate_file = NULL; char *certificate_file = NULL;
int verbose = 0; int verbose = 0;
int make_new_id = 0; int make_new_id = 0;
int months_lifetime = DEFAULT_LIFETIME;
EVP_PKEY *identity_key = NULL; EVP_PKEY *identity_key = NULL;
EVP_PKEY *signing_key = NULL; EVP_PKEY *signing_key = NULL;
@ -92,6 +94,16 @@ parse_commandline(int argc, char **argv)
return 1; return 1;
} }
certificate_file = tor_strdup(argv[++i]); certificate_file = tor_strdup(argv[++i]);
} else if (!strcmp(argv[i], "-m")) {
if (i+1>=argc) {
fprintf(stderr, "No argument to -m\n");
return 1;
}
months_lifetime = atoi(argv[++i]);
if (months_lifetime > 24 || months_lifetime < 0) {
fprintf(stderr, "Lifetime (in months) was out of range.");
return 1;
}
} else if (!strcmp(argv[i], "-v")) { } else if (!strcmp(argv[i], "-v")) {
verbose = 1; verbose = 1;
} else if (!strcmp(argv[i], "--create-identity-key")) { } else if (!strcmp(argv[i], "--create-identity-key")) {
@ -275,7 +287,9 @@ generate_certificate(void)
{ {
char buf[8192]; char buf[8192];
time_t now = time(NULL); time_t now = time(NULL);
struct tm tm;
char published[ISO_TIME_LEN+1]; char published[ISO_TIME_LEN+1];
char expires[ISO_TIME_LEN+1];
char fingerprint[FINGERPRINT_LEN+1]; char fingerprint[FINGERPRINT_LEN+1];
char *ident = key_to_string(identity_key); char *ident = key_to_string(identity_key);
char *signing = key_to_string(signing_key); char *signing = key_to_string(signing_key);
@ -286,16 +300,22 @@ generate_certificate(void)
int r; int r;
get_fingerprint(identity_key, fingerprint); get_fingerprint(identity_key, fingerprint);
tor_localtime_r(&now, &tm);
tm.tm_mon += months_lifetime;
format_iso_time(published, now); format_iso_time(published, now);
format_iso_time(expires, mktime(&tm));
tor_snprintf(buf, sizeof(buf), tor_snprintf(buf, sizeof(buf),
"dir-key-certificate-version 3\n" "dir-key-certificate-version 3\n"
"fingerprint %s\n" "fingerprint %s\n"
"dir-key-published %s\n" "dir-key-published %s\n"
"dir-key-expires %s\n"
"dir-identity-key\n%s" "dir-identity-key\n%s"
"dir-signing-key\n%s" "dir-signing-key\n%s"
"dir-key-certification\n", "dir-key-certification\n",
fingerprint, published, ident, signing); fingerprint, published, expires, ident, signing);
signed_len = strlen(buf); signed_len = strlen(buf);
SHA1((const unsigned char*)buf,signed_len,(unsigned char*)digest); SHA1((const unsigned char*)buf,signed_len,(unsigned char*)digest);