HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openssl: fix building with openssl 1.1 and later
[hcoop/domtool2.git]
/
openssl
/
openssl_sml.c
diff --git
a/openssl/openssl_sml.c
b/openssl/openssl_sml.c
index
fc82769
..
d934217
100644
(file)
--- a/
openssl/openssl_sml.c
+++ b/
openssl/openssl_sml.c
@@
-1,7
+1,8
@@
-#include
"openssl/bio.h"
-#include
"openssl/ssl.h"
-#include
"openssl/err.h"
+#include
<openssl/ssl.h>
+#include
<openssl/err.h>
+#include
<openssl/asn1.h>
+#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
@@
-24,6
+25,10
@@
int OpenSSL_SML_get_error() {
return ERR_get_error();
}
return ERR_get_error();
}
+int OpenSSL_SML_should_retry(BIO *b) {
+ return BIO_should_retry(b);
+}
+
const char *OpenSSL_SML_lib_error_string(int err) {
return ERR_lib_error_string(err);
}
const char *OpenSSL_SML_lib_error_string(int err) {
return ERR_lib_error_string(err);
}
@@
-69,6
+74,8
@@
SSL_CTX *OpenSSL_SML_CTX_new(SSL_METHOD *meth) {
SSL_CTX_set_verify(ctx,
SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
0);
SSL_CTX_set_verify(ctx,
SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
0);
+ SSL_CTX_set_verify_depth(ctx,
+ 2);
return ctx;
}
return ctx;
}
@@
-76,7
+83,7
@@
void OpenSSL_SML_CTX_free(SSL_CTX *ctx) {
return SSL_CTX_free(ctx);
}
return SSL_CTX_free(ctx);
}
-SSL_METHOD *OpenSSL_SML_SSLv23_method() {
+
const
SSL_METHOD *OpenSSL_SML_SSLv23_method() {
return SSLv23_method();
}
return SSLv23_method();
}
@@
-211,11
+218,11
@@
const char *OpenSSL_SML_get_peer_name(SSL *ssl) {
ASN1_STRING *s = X509_NAME_ENTRY_get_data(ne);
static char ret[1024];
ASN1_STRING *s = X509_NAME_ENTRY_get_data(ne);
static char ret[1024];
- if (
M_
ASN1_STRING_length(s) >= sizeof ret)
+ if (ASN1_STRING_length(s) >= sizeof ret)
return NULL;
else {
return NULL;
else {
- memcpy(ret,
M_ASN1_STRING_data(s), M_
ASN1_STRING_length(s));
- ret[
M_
ASN1_STRING_length(s)] = 0;
+ memcpy(ret,
ASN1_STRING_get0_data(s),
ASN1_STRING_length(s));
+ ret[ASN1_STRING_length(s)] = 0;
return ret;
}
} else {
return ret;
}
} else {