diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /tinc/files/public-key-fix.diff | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'tinc/files/public-key-fix.diff')
| -rw-r--r-- | tinc/files/public-key-fix.diff | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/tinc/files/public-key-fix.diff b/tinc/files/public-key-fix.diff index e69de29bb2..550cd67283 100644 --- a/tinc/files/public-key-fix.diff +++ b/tinc/files/public-key-fix.diff @@ -0,0 +1,21 @@ +don't load public key for "myself" because this creates problems with +keys saved in the subjectPublicKeyInfo format (as keys extracted from a +certificate) and is not necessary anyways because the private key already +contains the public key. + +diff -u -r1.1 -r1.2 +--- tinc/src/net_setup.c 2004/02/19 11:55:20 1.1 ++++ tinc/src/net_setup.c 2004/02/19 13:00:43 1.2 +@@ -250,8 +250,10 @@ + return false; + } + +- if(!read_rsa_public_key(myself->connection)) +- return false; ++ //br1: not needed because private key already contains the public key ++ //br1: removed because it creates problems with subjectPublicKeyInfo format keys ++ //if(!read_rsa_public_key(myself->connection)) ++ // return false; + + if(!get_config_string + (lookup_config(myself->connection->config_tree, "Port"), &myport))
\ No newline at end of file |