aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2017-01-03 15:31:03 -0800
committerGitHub <[email protected]>2017-01-03 15:31:03 -0800
commit0897c196e12627ef8e5eca99bada9027dfe9baaa (patch)
tree55b26cc538b35c712eca27f20e00d0fe1cc58b6e /openssl-sys/src
parentMerge pull request #541 from bluejekyll/master (diff)
parentAdd X509::stack_from_pem (diff)
downloadrust-openssl-0897c196e12627ef8e5eca99bada9027dfe9baaa.tar.xz
rust-openssl-0897c196e12627ef8e5eca99bada9027dfe9baaa.zip
Merge pull request #547 from sfackler/x509-stack
Add X509::stack_from_pem
Diffstat (limited to 'openssl-sys/src')
-rw-r--r--openssl-sys/src/lib.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 9b733402..80cfc47e 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -126,6 +126,9 @@ pub const BIO_FLAGS_SHOULD_RETRY: c_int = 0x08;
pub const CRYPTO_LOCK: c_int = 1;
+pub const ERR_LIB_PEM: c_int = 9;
+pub const PEM_R_NO_START_LINE: c_int = 108;
+
pub const EVP_MAX_MD_SIZE: c_uint = 64;
pub const EVP_PKEY_RSA: c_int = NID_rsaEncryption;
pub const EVP_PKEY_HMAC: c_int = NID_hmac;
@@ -1429,10 +1432,12 @@ extern {
pub fn EC_POINT_cmp(group: *const EC_GROUP, a: *const EC_POINT, b: *const EC_POINT, ctx: *mut BN_CTX) -> c_int;
pub fn EC_POINT_free(point: *mut EC_POINT);
+ pub fn ERR_peek_last_error() -> c_ulong;
pub fn ERR_get_error() -> c_ulong;
pub fn ERR_lib_error_string(err: c_ulong) -> *const c_char;
pub fn ERR_func_error_string(err: c_ulong) -> *const c_char;
pub fn ERR_reason_error_string(err: c_ulong) -> *const c_char;
+ pub fn ERR_clear_error();
pub fn EVP_md5() -> *const EVP_MD;
pub fn EVP_ripemd160() -> *const EVP_MD;