Introduce USE_OPENSSL_CERTS for certificate handling.

crypto/encryptor.h

Index: crypto/encryptor.h
diff --git a/crypto/encryptor.h b/crypto/encryptor.h
index bcc647bbc07075e266615ce025e56033b3eac576..ca4d20fa2a619400407999b5dd4b93c0ec353a67 100644
--- a/crypto/encryptor.h
+++ b/crypto/encryptor.h
@@ -13,7 +13,8 @@
 #include "build/build_config.h"
 #include "crypto/crypto_export.h"
 
-#if defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
+#if !defined(USE_OPENSSL) && \
+    (defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX))

[wtc, 2014/03/20 21:14:56]

This should be written like this:

#if defined(USE_NSS) || \
    (!defined(USE_OPENSSL) && (defined(OS_WIN) || defined(OS_MACOSX)))

Please make the same change to similar ifdefs in other files.

[haavardm, 2014/03/21 13:08:21]

That's what I had first actually, but I found it a bit complex. I  think they
logically are the same though, as long as USE_NSS and USE_OPENSSL are not both
defined.

I'll put that back your version if that is what you prefer.

[Ryan Sleevi, 2014/03/21 19:47:51]

I think I agree with Wan-Teh, in that I found myself having to consult his
version more than yours when trying to understand under what situations this
would be used. With the && (as written), I always have to keep that mental state
in place, whereas with the || (as wan-teh wrote), I can do fewer backtracking
about the conditions.

[haavardm, 2014/03/24 18:48:52]

Hmm.. Looking at it again, I agree. Although it is a slightly more complex
expression, it is easier to parse.

[haavardm, 2014/03/24 18:48:52]

Done.

 #include "crypto/scoped_nss_types.h"
 #endif