* contrib/hbssl/evpmd.c
* contrib/hbssl/hbssl.h
* moved hb_EVP_MD_ptr_to_id() function from static to public area
* contrib/hbssl/hbssl.hbx
* contrib/hbssl/hbssl.hbm
+ contrib/hbssl/d2i.c
* added new functions to extract asynchronous keys and certificates
from DER data:
D2I_PUBKEY( <cDER> ) -> <pEVPKey>
D2I_RSAPUBLICKEY( <cDER> ) -> <pRSAKey>
D2I_X509( <cDER> ) -> <pX509Cert>
* contrib/hbssl/hbssl.hbx
* contrib/hbssl/evppkey.c
+ added new functions to get/set RSA asymmetric keys parameters
encapsulated in EVP_PKEY structures:
EVP_PKEY_CTX_get_RSA_padding()
EVP_PKEY_CTX_set_RSA_padding()
EVP_PKEY_CTX_get_RSA_OAEP_md()
EVP_PKEY_CTX_set_RSA_OAEP_md()
EVP_PKEY_CTX_get_RSA_MGF1_md()
EVP_PKEY_CTX_set_RSA_MGF1_md()
* src/common/hbdate.c
* accept up to 9 fractional digits (nanoseconds) in timestamp strings
though only first three ones (milliseconds) are significant.
Recently some tools begin to generate such timestamp values and
Harbour had problems with decoding them correctly.
* src/compiler/hbmain.c
+ allow to pass file name for source code compiled by hb_compileFromBuf()
It works like in all other versions of hb_compile*() functions - it's
enough to pass it as argument without option prefix (option prefix
is "-" on all platforms and also "/" on DOS, OS2, MS-Win).
Please remember that first parameter after control ones is used as
compiler name in generated output messages regardless of its option
prefix.
255 lines
8.8 KiB
C
255 lines
8.8 KiB
C
/*
|
|
* OpenSSL API - C header.
|
|
*
|
|
* Copyright 2009 Viktor Szakats (vszakats.net/harbour)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; see the file LICENSE.txt. If not, write to
|
|
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
#ifndef HBSSL_H_
|
|
#define HBSSL_H_
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapierr.h"
|
|
#include "hbsocket.h"
|
|
|
|
/* pacify OpenSSL 3.0 depreciated warnings until we update the code */
|
|
#ifndef OPENSSL_API_COMPAT
|
|
#define OPENSSL_API_COMPAT 10100
|
|
#endif
|
|
|
|
#if defined( HB_OS_WIN )
|
|
#if ! defined( HB_OPENSSL_STATIC )
|
|
#define OPENSSL_OPT_WINDLL
|
|
#endif
|
|
#endif
|
|
|
|
/* following can be defined if MSYS/MinGW64 toolchain complains about lacking
|
|
'__int64' type inside OpenSSL project headers, also applink.c is not
|
|
needed on MinGW C runtime - therefore applink.c is not distributed there */
|
|
#if defined( HB_OPENSSL_MSYS )
|
|
#ifdef __MINGW64__
|
|
#include <basetsd.h>
|
|
#endif
|
|
#if ! defined( HB_OPENSSL_NO_APPLINK )
|
|
#define HB_OPENSSL_NO_APPLINK
|
|
#endif
|
|
#endif
|
|
|
|
#include <openssl/ssl.h>
|
|
|
|
#include "hbssl.ch"
|
|
|
|
#if OPENSSL_VERSION_NUMBER < 0x00906000L
|
|
/* #error "unsupported OpenSSL version, required 0.9.6 or higher" */
|
|
#endif
|
|
|
|
#if OPENSSL_VERSION_NUMBER < 0x00908060L
|
|
#ifndef OPENSSL_NO_SEED
|
|
#define OPENSSL_NO_SEED
|
|
#endif
|
|
#endif
|
|
#if OPENSSL_VERSION_NUMBER < 0x00908030L
|
|
#ifndef OPENSSL_NO_CAMELLIA
|
|
#define OPENSSL_NO_CAMELLIA
|
|
#endif
|
|
#endif
|
|
#if OPENSSL_VERSION_NUMBER < 0x00908000L
|
|
#ifndef OPENSSL_NO_DGRAM
|
|
#define OPENSSL_NO_DGRAM
|
|
#endif
|
|
#endif
|
|
#if OPENSSL_VERSION_NUMBER < 0x00907000L
|
|
#ifndef OPENSSL_NO_AES
|
|
#define OPENSSL_NO_AES
|
|
#endif
|
|
#if ! defined( SSLEAY_DIR )
|
|
#define SSLEAY_DIR 5
|
|
#endif
|
|
#if ! defined( SSL_ERROR_WANT_ACCEPT )
|
|
#define SSL_ERROR_WANT_ACCEPT 8
|
|
#endif
|
|
|
|
/* translate old configuration macros to new ones */
|
|
#if defined( NO_BF ) && ! defined( OPENSSL_NO_BF )
|
|
#define OPENSSL_NO_BF
|
|
#endif
|
|
#if defined( NO_CAST ) && ! defined( OPENSSL_NO_CAST )
|
|
#define OPENSSL_NO_CAST
|
|
#endif
|
|
#if defined( NO_DES ) && ! defined( OPENSSL_NO_DES )
|
|
#define OPENSSL_NO_DES
|
|
#endif
|
|
#if defined( NO_DSA ) && ! defined( OPENSSL_NO_DSA )
|
|
#define OPENSSL_NO_DSA
|
|
#endif
|
|
#if defined( NO_IDEA ) && ! defined( OPENSSL_NO_IDEA )
|
|
#define OPENSSL_NO_IDEA
|
|
#endif
|
|
#if defined( NO_MDC2 ) && ! defined( OPENSSL_NO_MDC2 )
|
|
#define OPENSSL_NO_MDC2
|
|
#endif
|
|
#if defined( NO_MD2 ) && ! defined( OPENSSL_NO_MD2 )
|
|
#define OPENSSL_NO_MD2
|
|
#endif
|
|
#if defined( NO_MD4 ) && ! defined( OPENSSL_NO_MD4 )
|
|
#define OPENSSL_NO_MD4
|
|
#endif
|
|
#if defined( NO_MD5 ) && ! defined( OPENSSL_NO_MD5 )
|
|
#define OPENSSL_NO_MD5
|
|
#endif
|
|
#if defined( NO_RC2 ) && ! defined( OPENSSL_NO_RC2 )
|
|
#define OPENSSL_NO_RC2
|
|
#endif
|
|
#if defined( NO_RC4 ) && ! defined( OPENSSL_NO_RC4 )
|
|
#define OPENSSL_NO_RC4
|
|
#endif
|
|
#if defined( NO_RC5 ) && ! defined( OPENSSL_NO_RC5 )
|
|
#define OPENSSL_NO_RC5
|
|
#endif
|
|
#if defined( NO_RIPEMD ) && ! defined( OPENSSL_NO_RIPEMD )
|
|
#define OPENSSL_NO_RIPEMD
|
|
#endif
|
|
#if defined( NO_RSA ) && ! defined( OPENSSL_NO_RSA )
|
|
#define OPENSSL_NO_RSA
|
|
#endif
|
|
#if defined( NO_FP_API ) && ! defined( OPENSSL_NO_FP_API )
|
|
#define OPENSSL_NO_FP_API
|
|
#endif
|
|
#if defined( NO_STDIO ) && ! defined( OPENSSL_NO_STDIO )
|
|
#define OPENSSL_NO_STDIO
|
|
#endif
|
|
|
|
#endif
|
|
#if OPENSSL_VERSION_NUMBER < 0x00908000L
|
|
#if OPENSSL_VERSION_NUMBER < 0x00907080L || ! defined( OPENSSL_FIPS )
|
|
#ifndef OPENSSL_NO_SHA256
|
|
#define OPENSSL_NO_SHA256
|
|
#endif
|
|
#ifndef OPENSSL_NO_SHA512
|
|
#define OPENSSL_NO_SHA512
|
|
#endif
|
|
#endif
|
|
#endif
|
|
#if OPENSSL_VERSION_NUMBER < 0x00906030L
|
|
#define SSL_get_rfd SSL_get_fd
|
|
#define SSL_get_wfd SSL_get_fd
|
|
#endif
|
|
|
|
#if ! defined( OPENSSL_VERSION )
|
|
#define OPENSSL_VERSION SSLEAY_VERSION
|
|
#define OPENSSL_CFLAGS SSLEAY_CFLAGS
|
|
#define OPENSSL_BUILT_ON SSLEAY_BUILT_ON
|
|
#define OPENSSL_PLATFORM SSLEAY_PLATFORM
|
|
#define OPENSSL_DIR SSLEAY_DIR
|
|
#endif
|
|
|
|
/* use macro to pacify warnings with missing 'const' in some function
|
|
declarations in OpenSSL prior 0.9.8 */
|
|
#if OPENSSL_VERSION_NUMBER < 0x0090800fL
|
|
#define HB_SSL_CONST
|
|
#define HB_SSL_CONST_BYTE( x ) ( ( unsigned char * ) ( x ) )
|
|
#else
|
|
#define HB_SSL_CONST const
|
|
#define HB_SSL_CONST_BYTE( x ) ( ( const unsigned char * ) ( x ) )
|
|
#endif
|
|
|
|
HB_EXTERN_BEGIN
|
|
|
|
struct _HB_SSLSTREAM;
|
|
typedef struct _HB_SSLSTREAM * PHB_SSLSTREAM;
|
|
|
|
extern PHB_SOCKEX hb_sockexNewSSL( HB_SOCKET sd, SSL * ssl, HB_BOOL fServer,
|
|
HB_MAXINT timeout, PHB_ITEM pSSL );
|
|
extern PHB_SSLSTREAM hb_ssl_socketNew( HB_SOCKET sd, SSL * ssl, HB_BOOL fServer,
|
|
HB_MAXINT timeout, PHB_ITEM pSSL, int * piResult );
|
|
extern void hb_ssl_socketClose( PHB_SSLSTREAM pStream );
|
|
extern const char * hb_ssl_socketErrorStr( int iError );
|
|
extern long hb_ssl_socketRead( PHB_SSLSTREAM pStream, HB_SOCKET sd,
|
|
void * buffer, long len, HB_MAXINT timeout );
|
|
extern long hb_ssl_socketWrite( PHB_SSLSTREAM pStream, HB_SOCKET sd,
|
|
const void * buffer, long len,
|
|
HB_MAXINT timeout, long * plast );
|
|
|
|
extern const SSL_METHOD * hb_ssl_method_id_to_ptr( int n );
|
|
|
|
extern HB_BOOL hb_BIO_is( int iParam );
|
|
extern BIO * hb_BIO_par( int iParam );
|
|
|
|
extern HB_BOOL hb_SSL_CTX_is( int iParam );
|
|
extern SSL_CTX * hb_SSL_CTX_par( int iParam );
|
|
extern SSL_CTX * hb_SSL_CTX_itemGet( PHB_ITEM pItem );
|
|
|
|
extern HB_BOOL hb_SSL_is( int iParam );
|
|
extern SSL * hb_SSL_par( int iParam );
|
|
extern SSL * hb_SSL_itemGet( PHB_ITEM pItem );
|
|
|
|
extern HB_BOOL hb_SSL_SESSION_is( int iParam );
|
|
extern SSL_SESSION * hb_SSL_SESSION_par( int iParam );
|
|
|
|
extern HB_BOOL hb_X509_is( int iParam );
|
|
extern X509 * hb_X509_par( int iParam );
|
|
extern void hb_X509_ret( X509 * x509 );
|
|
|
|
extern HB_BOOL hb_RSA_is( int iParam );
|
|
extern RSA * hb_RSA_par( int iParam );
|
|
extern void hb_RSA_par_remove( int iParam );
|
|
extern void hb_RSA_ret( RSA * rsa );
|
|
|
|
extern HB_BOOL hb_EVP_MD_is( int iParam );
|
|
extern const EVP_MD * hb_EVP_MD_par( int iParam );
|
|
extern int hb_EVP_MD_ptr_to_id( const EVP_MD * p );
|
|
|
|
extern HB_BOOL hb_EVP_CIPHER_is( int iParam );
|
|
extern const EVP_CIPHER * hb_EVP_CIPHER_par( int iParam );
|
|
|
|
extern HB_BOOL hb_EVP_PKEY_is( int iParam );
|
|
extern EVP_PKEY * hb_EVP_PKEY_par( int iParam );
|
|
extern EVP_PKEY * hb_EVP_PKEY_get( PHB_ITEM pItem );
|
|
extern void hb_EVP_PKEY_free( PHB_ITEM pItem );
|
|
extern void hb_EVP_PKEY_ret( EVP_PKEY * pkey );
|
|
|
|
extern char * hb_openssl_strdup( const char * pszText );
|
|
|
|
HB_EXTERN_END
|
|
|
|
#endif /* HBSSL_H_ */
|