aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-06-13 04:26:05 +0000
committerRoger Dingledine <arma@torproject.org>2008-06-13 04:26:05 +0000
commitd395135e2f9a7181e09b04e9b4629ec98b8a794e (patch)
tree3edcb2a75395d76b68110c486af9cc2a0d706bb2 /src/common
parentbcde95509d5224a5e1f388bff1318c7b5f6f6a1b (diff)
downloadtor-d395135e2f9a7181e09b04e9b4629ec98b8a794e.tar
tor-d395135e2f9a7181e09b04e9b4629ec98b8a794e.tar.gz
fix a few typos, and give the bootstrap phase stuff a changelog entry.
svn:r15183
Diffstat (limited to 'src/common')
-rw-r--r--src/common/ciphers.inc2
-rw-r--r--src/common/tortls.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/common/ciphers.inc b/src/common/ciphers.inc
index 37147e4bf..c84620d49 100644
--- a/src/common/ciphers.inc
+++ b/src/common/ciphers.inc
@@ -1,5 +1,5 @@
/* This is an include file used to define the list of ciphers clients should
- * advertise. Before including it, you should define the CIPHER and XCPIHER
+ * advertise. Before including it, you should define the CIPHER and XCIPHER
* macros. */
#ifdef TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
CIPHER(0xc00a, TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA)
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 73e1e7764..46b2a11e2 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -104,10 +104,10 @@ struct tor_tls_t {
#ifdef V2_HANDSHAKE_CLIENT
/** An array of fake SSL_CIPHER objects that we use in order to trick OpenSSL
* in client mode into advertising the ciphers we want. See
- * rectify_client_ciphers for details. */
+ * rectify_client_ciphers() for details. */
static SSL_CIPHER *CLIENT_CIPHER_DUMMIES = NULL;
/** A stack of SSL_CIPHER objects, some real, some fake.
- * See rectify_client_ciphers for details. */
+ * See rectify_client_ciphers() for details. */
static STACK_OF(SSL_CIPHER) *CLIENT_CIPHER_STACK = NULL;
#endif
@@ -731,7 +731,7 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val)
#endif
/** Replace *<b>ciphers</b> with a new list of SSL ciphersuites: specifically,
- * a list designed to mimic a common web browser. Some of the cipher in the
+ * a list designed to mimic a common web browser. Some of the ciphers in the
* list won't actually be implemented by OpenSSL: that's okay so long as the
* server doesn't select them, and the server won't select anything besides
* what's in SERVER_CIPHER_LIST.