import libs for openssl

git-svn-id: http://svn.miranda-ng.org/main/trunk@16505 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 209 insertions, 227 deletions

diff --git a/include/openssl/ossl_typ.h b/include/openssl/ossl_typ.h
index 7a8d319989..15da44aabf 100644
--- a/include/openssl/ossl_typ.h
+++ b/include/openssl/ossl_typ.h
@@ -1,227 +1,209 @@
-/* ====================================================================
- * Copyright (c) 1998-2015 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_OPENSSL_TYPES_H
-# define HEADER_OPENSSL_TYPES_H
-
-#include <limits.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# include <openssl/e_os2.h>
-
-# ifdef NO_ASN1_TYPEDEFS
-#  define ASN1_INTEGER            ASN1_STRING
-#  define ASN1_ENUMERATED         ASN1_STRING
-#  define ASN1_BIT_STRING         ASN1_STRING
-#  define ASN1_OCTET_STRING       ASN1_STRING
-#  define ASN1_PRINTABLESTRING    ASN1_STRING
-#  define ASN1_T61STRING          ASN1_STRING
-#  define ASN1_IA5STRING          ASN1_STRING
-#  define ASN1_UTCTIME            ASN1_STRING
-#  define ASN1_GENERALIZEDTIME    ASN1_STRING
-#  define ASN1_TIME               ASN1_STRING
-#  define ASN1_GENERALSTRING      ASN1_STRING
-#  define ASN1_UNIVERSALSTRING    ASN1_STRING
-#  define ASN1_BMPSTRING          ASN1_STRING
-#  define ASN1_VISIBLESTRING      ASN1_STRING
-#  define ASN1_UTF8STRING         ASN1_STRING
-#  define ASN1_BOOLEAN            int
-#  define ASN1_NULL               int
-# else
-typedef struct asn1_string_st ASN1_INTEGER;
-typedef struct asn1_string_st ASN1_ENUMERATED;
-typedef struct asn1_string_st ASN1_BIT_STRING;
-typedef struct asn1_string_st ASN1_OCTET_STRING;
-typedef struct asn1_string_st ASN1_PRINTABLESTRING;
-typedef struct asn1_string_st ASN1_T61STRING;
-typedef struct asn1_string_st ASN1_IA5STRING;
-typedef struct asn1_string_st ASN1_GENERALSTRING;
-typedef struct asn1_string_st ASN1_UNIVERSALSTRING;
-typedef struct asn1_string_st ASN1_BMPSTRING;
-typedef struct asn1_string_st ASN1_UTCTIME;
-typedef struct asn1_string_st ASN1_TIME;
-typedef struct asn1_string_st ASN1_GENERALIZEDTIME;
-typedef struct asn1_string_st ASN1_VISIBLESTRING;
-typedef struct asn1_string_st ASN1_UTF8STRING;
-typedef struct asn1_string_st ASN1_STRING;
-typedef int ASN1_BOOLEAN;
-typedef int ASN1_NULL;
-# endif
-
-typedef struct asn1_object_st ASN1_OBJECT;
-
-typedef struct ASN1_ITEM_st ASN1_ITEM;
-typedef struct asn1_pctx_st ASN1_PCTX;
-typedef struct asn1_sctx_st ASN1_SCTX;
-
-# ifdef OPENSSL_SYS_WIN32
-#  undef X509_NAME
-#  undef X509_EXTENSIONS
-#  undef PKCS7_ISSUER_AND_SERIAL
-#  undef OCSP_REQUEST
-#  undef OCSP_RESPONSE
-# endif
-
-# ifdef BIGNUM
-#  undef BIGNUM
-# endif
-typedef struct bio_st BIO;
-typedef struct bignum_st BIGNUM;
-typedef struct bignum_ctx BN_CTX;
-typedef struct bn_blinding_st BN_BLINDING;
-typedef struct bn_mont_ctx_st BN_MONT_CTX;
-typedef struct bn_recp_ctx_st BN_RECP_CTX;
-typedef struct bn_gencb_st BN_GENCB;
-
-typedef struct buf_mem_st BUF_MEM;
-
-typedef struct evp_cipher_st EVP_CIPHER;
-typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;
-typedef struct evp_md_st EVP_MD;
-typedef struct evp_md_ctx_st EVP_MD_CTX;
-typedef struct evp_pkey_st EVP_PKEY;
-
-typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD;
-
-typedef struct evp_pkey_method_st EVP_PKEY_METHOD;
-typedef struct evp_pkey_ctx_st EVP_PKEY_CTX;
-
-typedef struct evp_Encode_Ctx_st EVP_ENCODE_CTX;
-
-typedef struct hmac_ctx_st HMAC_CTX;
-
-typedef struct dh_st DH;
-typedef struct dh_method DH_METHOD;
-
-typedef struct dsa_st DSA;
-typedef struct dsa_method DSA_METHOD;
-
-typedef struct rsa_st RSA;
-typedef struct rsa_meth_st RSA_METHOD;
-
-typedef struct ec_key_st EC_KEY;
-typedef struct ec_key_method_st EC_KEY_METHOD;
-
-typedef struct rand_meth_st RAND_METHOD;
-
-typedef struct x509_st X509;
-typedef struct X509_algor_st X509_ALGOR;
-typedef struct X509_crl_st X509_CRL;
-typedef struct x509_crl_method_st X509_CRL_METHOD;
-typedef struct x509_revoked_st X509_REVOKED;
-typedef struct X509_name_st X509_NAME;
-typedef struct X509_pubkey_st X509_PUBKEY;
-typedef struct x509_store_st X509_STORE;
-typedef struct x509_store_ctx_st X509_STORE_CTX;
-
-typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO;
-
-typedef struct v3_ext_ctx X509V3_CTX;
-typedef struct conf_st CONF;
-typedef struct ossl_init_settings_st OPENSSL_INIT_SETTINGS;
-
-typedef struct ui_st UI;
-typedef struct ui_method_st UI_METHOD;
-
-typedef struct engine_st ENGINE;
-typedef struct ssl_st SSL;
-typedef struct ssl_ctx_st SSL_CTX;
-
-typedef struct comp_ctx_st COMP_CTX;
-typedef struct comp_method_st COMP_METHOD;
-
-typedef struct X509_POLICY_NODE_st X509_POLICY_NODE;
-typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL;
-typedef struct X509_POLICY_TREE_st X509_POLICY_TREE;
-typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE;
-
-typedef struct AUTHORITY_KEYID_st AUTHORITY_KEYID;
-typedef struct DIST_POINT_st DIST_POINT;
-typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT;
-typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS;
-
-typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
-
-typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
-typedef struct ocsp_response_st OCSP_RESPONSE;
-typedef struct ocsp_responder_id_st OCSP_RESPID;
-
-typedef struct sct_st SCT;
-typedef struct sct_ctx_st SCT_CTX;
-typedef struct ctlog_st CTLOG;
-typedef struct ctlog_store_st CTLOG_STORE;
-typedef struct ct_policy_eval_ctx_st CT_POLICY_EVAL_CTX;
-
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
-    defined(INTMAX_MAX) && defined(UINTMAX_MAX)
-typedef intmax_t ossl_intmax_t;
-typedef uintmax_t ossl_uintmax_t;
-#else
-/*
- * Not long long, because the C-library can only be expected to provide
- * strtoll(), strtoull() at the same time as intmax_t and strtoimax(),
- * strtoumax().  Since we use these for parsing arguments, we need the
- * conversion functions, not just the sizes.
- */
-typedef long ossl_intmax_t;
-typedef unsigned long ossl_uintmax_t;
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-#endif                          /* def HEADER_OPENSSL_TYPES_H */
+/* ====================================================================

+ * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ *

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in

+ *    the documentation and/or other materials provided with the

+ *    distribution.

+ *

+ * 3. All advertising materials mentioning features or use of this

+ *    software must display the following acknowledgment:

+ *    "This product includes software developed by the OpenSSL Project

+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"

+ *

+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

+ *    endorse or promote products derived from this software without

+ *    prior written permission. For written permission, please contact

+ *    openssl-core@openssl.org.

+ *

+ * 5. Products derived from this software may not be called "OpenSSL"

+ *    nor may "OpenSSL" appear in their names without prior written

+ *    permission of the OpenSSL Project.

+ *

+ * 6. Redistributions of any form whatsoever must retain the following

+ *    acknowledgment:

+ *    "This product includes software developed by the OpenSSL Project

+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

+ * OF THE POSSIBILITY OF SUCH DAMAGE.

+ * ====================================================================

+ *

+ * This product includes cryptographic software written by Eric Young

+ * (eay@cryptsoft.com).  This product includes software written by Tim

+ * Hudson (tjh@cryptsoft.com).

+ *

+ */

+

+#ifndef HEADER_OPENSSL_TYPES_H

+#define HEADER_OPENSSL_TYPES_H

+

+#ifdef  __cplusplus

+extern "C" {

+#endif

+

+#include <openssl/e_os2.h>

+

+#ifdef NO_ASN1_TYPEDEFS

+#define ASN1_INTEGER		ASN1_STRING

+#define ASN1_ENUMERATED		ASN1_STRING

+#define ASN1_BIT_STRING		ASN1_STRING

+#define ASN1_OCTET_STRING	ASN1_STRING

+#define ASN1_PRINTABLESTRING	ASN1_STRING

+#define ASN1_T61STRING		ASN1_STRING

+#define ASN1_IA5STRING		ASN1_STRING

+#define ASN1_UTCTIME		ASN1_STRING

+#define ASN1_GENERALIZEDTIME	ASN1_STRING

+#define ASN1_TIME		ASN1_STRING

+#define ASN1_GENERALSTRING	ASN1_STRING

+#define ASN1_UNIVERSALSTRING	ASN1_STRING

+#define ASN1_BMPSTRING		ASN1_STRING

+#define ASN1_VISIBLESTRING	ASN1_STRING

+#define ASN1_UTF8STRING		ASN1_STRING

+#define ASN1_BOOLEAN		int

+#define ASN1_NULL		int

+#else

+typedef struct asn1_string_st ASN1_INTEGER;

+typedef struct asn1_string_st ASN1_ENUMERATED;

+typedef struct asn1_string_st ASN1_BIT_STRING;

+typedef struct asn1_string_st ASN1_OCTET_STRING;

+typedef struct asn1_string_st ASN1_PRINTABLESTRING;

+typedef struct asn1_string_st ASN1_T61STRING;

+typedef struct asn1_string_st ASN1_IA5STRING;

+typedef struct asn1_string_st ASN1_GENERALSTRING;

+typedef struct asn1_string_st ASN1_UNIVERSALSTRING;

+typedef struct asn1_string_st ASN1_BMPSTRING;

+typedef struct asn1_string_st ASN1_UTCTIME;

+typedef struct asn1_string_st ASN1_TIME;

+typedef struct asn1_string_st ASN1_GENERALIZEDTIME;

+typedef struct asn1_string_st ASN1_VISIBLESTRING;

+typedef struct asn1_string_st ASN1_UTF8STRING;

+typedef struct asn1_string_st ASN1_STRING;

+typedef int ASN1_BOOLEAN;

+typedef int ASN1_NULL;

+#endif

+

+typedef struct ASN1_ITEM_st ASN1_ITEM;

+typedef struct asn1_pctx_st ASN1_PCTX;

+

+#ifdef OPENSSL_SYS_WIN32

+#undef X509_NAME

+#undef X509_EXTENSIONS

+#undef X509_CERT_PAIR

+#undef PKCS7_ISSUER_AND_SERIAL

+#undef OCSP_REQUEST

+#undef OCSP_RESPONSE

+#endif

+

+#ifdef BIGNUM

+#undef BIGNUM

+#endif

+typedef struct bignum_st BIGNUM;

+typedef struct bignum_ctx BN_CTX;

+typedef struct bn_blinding_st BN_BLINDING;

+typedef struct bn_mont_ctx_st BN_MONT_CTX;

+typedef struct bn_recp_ctx_st BN_RECP_CTX;

+typedef struct bn_gencb_st BN_GENCB;

+

+typedef struct buf_mem_st BUF_MEM;

+

+typedef struct evp_cipher_st EVP_CIPHER;

+typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;

+typedef struct env_md_st EVP_MD;

+typedef struct env_md_ctx_st EVP_MD_CTX;

+typedef struct evp_pkey_st EVP_PKEY;

+

+typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD;

+

+typedef struct evp_pkey_method_st EVP_PKEY_METHOD;

+typedef struct evp_pkey_ctx_st EVP_PKEY_CTX;

+

+typedef struct dh_st DH;

+typedef struct dh_method DH_METHOD;

+

+typedef struct dsa_st DSA;

+typedef struct dsa_method DSA_METHOD;

+

+typedef struct rsa_st RSA;

+typedef struct rsa_meth_st RSA_METHOD;

+

+typedef struct rand_meth_st RAND_METHOD;

+

+typedef struct ecdh_method ECDH_METHOD;

+typedef struct ecdsa_method ECDSA_METHOD;

+

+typedef struct x509_st X509;

+typedef struct X509_algor_st X509_ALGOR;

+typedef struct X509_crl_st X509_CRL;

+typedef struct x509_crl_method_st X509_CRL_METHOD;

+typedef struct x509_revoked_st X509_REVOKED;

+typedef struct X509_name_st X509_NAME;

+typedef struct X509_pubkey_st X509_PUBKEY;

+typedef struct x509_store_st X509_STORE;

+typedef struct x509_store_ctx_st X509_STORE_CTX;

+

+typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO;

+

+typedef struct v3_ext_ctx X509V3_CTX;

+typedef struct conf_st CONF;

+

+typedef struct store_st STORE;

+typedef struct store_method_st STORE_METHOD;

+

+typedef struct ui_st UI;

+typedef struct ui_method_st UI_METHOD;

+

+typedef struct st_ERR_FNS ERR_FNS;

+

+typedef struct engine_st ENGINE;

+typedef struct ssl_st SSL;

+typedef struct ssl_ctx_st SSL_CTX;

+

+typedef struct X509_POLICY_NODE_st X509_POLICY_NODE;

+typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL;

+typedef struct X509_POLICY_TREE_st X509_POLICY_TREE;

+typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE;

+

+typedef struct AUTHORITY_KEYID_st AUTHORITY_KEYID;

+typedef struct DIST_POINT_st DIST_POINT;

+typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT;

+typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS;

+

+  /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */

+#define DECLARE_PKCS12_STACK_OF(type) /* Nothing */

+#define IMPLEMENT_PKCS12_STACK_OF(type) /* Nothing */

+

+typedef struct crypto_ex_data_st CRYPTO_EX_DATA;

+/* Callback types for crypto.h */

+typedef int CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad,

+					int idx, long argl, void *argp);

+typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad,

+					int idx, long argl, void *argp);

+typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d,

+					int idx, long argl, void *argp);

+

+typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;

+typedef struct ocsp_response_st OCSP_RESPONSE;

+typedef struct ocsp_responder_id_st OCSP_RESPID;

+

+#ifdef  __cplusplus

+}

+#endif

+#endif /* def HEADER_OPENSSL_TYPES_H */