Skip to content

Commit

Permalink
OpenSSL component build fixes.
Browse files Browse the repository at this point in the history
BUG=none
TEST=build with component=shared_library use_openssl=1


Review URL: http://codereview.chromium.org/8166003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104342 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
mattm@chromium.org committed Oct 6, 2011
1 parent 778f1e6 commit fb10ca0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
3 changes: 2 additions & 1 deletion crypto/openssl_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include "base/basictypes.h"
#include "base/location.h"
#include "crypto/crypto_export.h"

namespace crypto {

Expand Down Expand Up @@ -80,7 +81,7 @@ class ScopedOpenSSLSafeSizeBuffer {
// before any other OpenSSL functions.
// This function is thread-safe, and OpenSSL will only ever be initialized once.
// OpenSSL will be properly shut down on program exit.
void EnsureOpenSSLInit();
void CRYPTO_EXPORT EnsureOpenSSLInit();

// Drains the OpenSSL ERR_get_error stack. On a debug build the error codes
// are send to VLOG(1), on a release build they are disregarded. In most
Expand Down
20 changes: 13 additions & 7 deletions net/base/x509_util_openssl.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include <string>
#include <vector>

#include "net/base/net_export.h"

namespace base {
class Time;
} // namespace base
Expand All @@ -22,16 +24,20 @@ namespace net {
// into more convenient std / base datatypes.
namespace x509_util {

bool ParsePrincipalKeyAndValueByIndex(X509_NAME* name,
int index,
std::string* key,
std::string* value);
bool NET_EXPORT ParsePrincipalKeyAndValueByIndex(X509_NAME* name,
int index,
std::string* key,
std::string* value);

bool ParsePrincipalValueByIndex(X509_NAME* name, int index, std::string* value);
bool NET_EXPORT ParsePrincipalValueByIndex(X509_NAME* name,
int index,
std::string* value);

bool ParsePrincipalValueByNID(X509_NAME* name, int nid, std::string* value);
bool NET_EXPORT ParsePrincipalValueByNID(X509_NAME* name,
int nid,
std::string* value);

bool ParseDate(ASN1_TIME* x509_time, base::Time* time);
bool NET_EXPORT ParseDate(ASN1_TIME* x509_time, base::Time* time);

} // namespace x509_util

Expand Down

0 comments on commit fb10ca0

Please sign in to comment.