summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ba051c3)
Patch provided by Robin Templeton <robin@hcoop.net>
-#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 <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
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();
}
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)
- 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;
-#include "openssl/bio.h"
-#include "openssl/ssl.h"
-#include "openssl/err.h"
+#include <openssl/ossl_typ.h>
+
+/* SSL_METHOD is defined in <openssl/ssl.h>, which #includes system
+ headers that ml-nlffigen can't parse. */
+
+typedef struct ssl_method_st SSL_METHOD;
void OpenSSL_SML_init(void);
void OpenSSL_SML_load_error_strings(void);
void OpenSSL_SML_init(void);
void OpenSSL_SML_load_error_strings(void);