remove SSLEAY_MACROS code
This commit is contained in:
Nils Larsch
parent
8a4af56fc6
commit
1611b9ed80
135
crypto/pem/pem.h
135
crypto/pem/pem.h
@ -393,138 +393,6 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
|
|||||||
DECLARE_PEM_read(name, type) \
|
DECLARE_PEM_read(name, type) \
|
||||||
DECLARE_PEM_write_cb(name, type)
|
DECLARE_PEM_write_cb(name, type)
|
||||||
|
|
||||||
#ifdef SSLEAY_MACROS
|
|
||||||
|
|
||||||
#define PEM_write_SSL_SESSION(fp,x) \
|
|
||||||
PEM_ASN1_write((int (*)())i2d_SSL_SESSION, \
|
|
||||||
PEM_STRING_SSL_SESSION,fp, (char *)x, NULL,NULL,0,NULL,NULL)
|
|
||||||
#define PEM_write_X509(fp,x) \
|
|
||||||
PEM_ASN1_write((int (*)())i2d_X509,PEM_STRING_X509,fp, \
|
|
||||||
(char *)x, NULL,NULL,0,NULL,NULL)
|
|
||||||
#define PEM_write_X509_REQ(fp,x) PEM_ASN1_write( \
|
|
||||||
(int (*)())i2d_X509_REQ,PEM_STRING_X509_REQ,fp,(char *)x, \
|
|
||||||
NULL,NULL,0,NULL,NULL)
|
|
||||||
#define PEM_write_X509_CRL(fp,x) \
|
|
||||||
PEM_ASN1_write((int (*)())i2d_X509_CRL,PEM_STRING_X509_CRL, \
|
|
||||||
fp,(char *)x, NULL,NULL,0,NULL,NULL)
|
|
||||||
#define PEM_write_RSAPrivateKey(fp,x,enc,kstr,klen,cb,u) \
|
|
||||||
PEM_ASN1_write((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,fp,\
|
|
||||||
(char *)x,enc,kstr,klen,cb,u)
|
|
||||||
#define PEM_write_RSAPublicKey(fp,x) \
|
|
||||||
PEM_ASN1_write((int (*)())i2d_RSAPublicKey,\
|
|
||||||
PEM_STRING_RSA_PUBLIC,fp,(char *)x,NULL,NULL,0,NULL,NULL)
|
|
||||||
#define PEM_write_DSAPrivateKey(fp,x,enc,kstr,klen,cb,u) \
|
|
||||||
PEM_ASN1_write((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,fp,\
|
|
||||||
(char *)x,enc,kstr,klen,cb,u)
|
|
||||||
#define PEM_write_PrivateKey(bp,x,enc,kstr,klen,cb,u) \
|
|
||||||
PEM_ASN1_write((int (*)())i2d_PrivateKey,\
|
|
||||||
(((x)->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),\
|
|
||||||
bp,(char *)x,enc,kstr,klen,cb,u)
|
|
||||||
#define PEM_write_PKCS7(fp,x) \
|
|
||||||
PEM_ASN1_write((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,fp, \
|
|
||||||
(char *)x, NULL,NULL,0,NULL,NULL)
|
|
||||||
#define PEM_write_DHparams(fp,x) \
|
|
||||||
PEM_ASN1_write((int (*)())i2d_DHparams,PEM_STRING_DHPARAMS,fp,\
|
|
||||||
(char *)x,NULL,NULL,0,NULL,NULL)
|
|
||||||
|
|
||||||
#define PEM_write_NETSCAPE_CERT_SEQUENCE(fp,x) \
|
|
||||||
PEM_ASN1_write((int (*)())i2d_NETSCAPE_CERT_SEQUENCE, \
|
|
||||||
PEM_STRING_X509,fp, \
|
|
||||||
(char *)x, NULL,NULL,0,NULL,NULL)
|
|
||||||
|
|
||||||
#define PEM_read_SSL_SESSION(fp,x,cb,u) (SSL_SESSION *)PEM_ASN1_read( \
|
|
||||||
(char *(*)())d2i_SSL_SESSION,PEM_STRING_SSL_SESSION,fp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_X509(fp,x,cb,u) (X509 *)PEM_ASN1_read( \
|
|
||||||
(char *(*)())d2i_X509,PEM_STRING_X509,fp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_X509_REQ(fp,x,cb,u) (X509_REQ *)PEM_ASN1_read( \
|
|
||||||
(char *(*)())d2i_X509_REQ,PEM_STRING_X509_REQ,fp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_X509_CRL(fp,x,cb,u) (X509_CRL *)PEM_ASN1_read( \
|
|
||||||
(char *(*)())d2i_X509_CRL,PEM_STRING_X509_CRL,fp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_RSAPrivateKey(fp,x,cb,u) (RSA *)PEM_ASN1_read( \
|
|
||||||
(char *(*)())d2i_RSAPrivateKey,PEM_STRING_RSA,fp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_RSAPublicKey(fp,x,cb,u) (RSA *)PEM_ASN1_read( \
|
|
||||||
(char *(*)())d2i_RSAPublicKey,PEM_STRING_RSA_PUBLIC,fp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_DSAPrivateKey(fp,x,cb,u) (DSA *)PEM_ASN1_read( \
|
|
||||||
(char *(*)())d2i_DSAPrivateKey,PEM_STRING_DSA,fp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_PrivateKey(fp,x,cb,u) (EVP_PKEY *)PEM_ASN1_read( \
|
|
||||||
(char *(*)())d2i_PrivateKey,PEM_STRING_EVP_PKEY,fp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_PKCS7(fp,x,cb,u) (PKCS7 *)PEM_ASN1_read( \
|
|
||||||
(char *(*)())d2i_PKCS7,PEM_STRING_PKCS7,fp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_DHparams(fp,x,cb,u) (DH *)PEM_ASN1_read( \
|
|
||||||
(char *(*)())d2i_DHparams,PEM_STRING_DHPARAMS,fp,(char **)x,cb,u)
|
|
||||||
|
|
||||||
#define PEM_read_NETSCAPE_CERT_SEQUENCE(fp,x,cb,u) \
|
|
||||||
(NETSCAPE_CERT_SEQUENCE *)PEM_ASN1_read( \
|
|
||||||
(char *(*)())d2i_NETSCAPE_CERT_SEQUENCE,PEM_STRING_X509,fp,\
|
|
||||||
(char **)x,cb,u)
|
|
||||||
|
|
||||||
#define PEM_write_bio_X509(bp,x) \
|
|
||||||
PEM_ASN1_write_bio((int (*)())i2d_X509,PEM_STRING_X509,bp, \
|
|
||||||
(char *)x, NULL,NULL,0,NULL,NULL)
|
|
||||||
#define PEM_write_bio_X509_REQ(bp,x) PEM_ASN1_write_bio( \
|
|
||||||
(int (*)())i2d_X509_REQ,PEM_STRING_X509_REQ,bp,(char *)x, \
|
|
||||||
NULL,NULL,0,NULL,NULL)
|
|
||||||
#define PEM_write_bio_X509_CRL(bp,x) \
|
|
||||||
PEM_ASN1_write_bio((int (*)())i2d_X509_CRL,PEM_STRING_X509_CRL,\
|
|
||||||
bp,(char *)x, NULL,NULL,0,NULL,NULL)
|
|
||||||
#define PEM_write_bio_RSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \
|
|
||||||
PEM_ASN1_write_bio((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,\
|
|
||||||
bp,(char *)x,enc,kstr,klen,cb,u)
|
|
||||||
#define PEM_write_bio_RSAPublicKey(bp,x) \
|
|
||||||
PEM_ASN1_write_bio((int (*)())i2d_RSAPublicKey, \
|
|
||||||
PEM_STRING_RSA_PUBLIC,\
|
|
||||||
bp,(char *)x,NULL,NULL,0,NULL,NULL)
|
|
||||||
#define PEM_write_bio_DSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \
|
|
||||||
PEM_ASN1_write_bio((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,\
|
|
||||||
bp,(char *)x,enc,kstr,klen,cb,u)
|
|
||||||
#define PEM_write_bio_PrivateKey(bp,x,enc,kstr,klen,cb,u) \
|
|
||||||
PEM_ASN1_write_bio((int (*)())i2d_PrivateKey,\
|
|
||||||
(((x)->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),\
|
|
||||||
bp,(char *)x,enc,kstr,klen,cb,u)
|
|
||||||
#define PEM_write_bio_PKCS7(bp,x) \
|
|
||||||
PEM_ASN1_write_bio((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,bp, \
|
|
||||||
(char *)x, NULL,NULL,0,NULL,NULL)
|
|
||||||
#define PEM_write_bio_DHparams(bp,x) \
|
|
||||||
PEM_ASN1_write_bio((int (*)())i2d_DHparams,PEM_STRING_DHPARAMS,\
|
|
||||||
bp,(char *)x,NULL,NULL,0,NULL,NULL)
|
|
||||||
#define PEM_write_bio_DSAparams(bp,x) \
|
|
||||||
PEM_ASN1_write_bio((int (*)())i2d_DSAparams, \
|
|
||||||
PEM_STRING_DSAPARAMS,bp,(char *)x,NULL,NULL,0,NULL,NULL)
|
|
||||||
|
|
||||||
#define PEM_write_bio_NETSCAPE_CERT_SEQUENCE(bp,x) \
|
|
||||||
PEM_ASN1_write_bio((int (*)())i2d_NETSCAPE_CERT_SEQUENCE, \
|
|
||||||
PEM_STRING_X509,bp, \
|
|
||||||
(char *)x, NULL,NULL,0,NULL,NULL)
|
|
||||||
|
|
||||||
#define PEM_read_bio_X509(bp,x,cb,u) (X509 *)PEM_ASN1_read_bio( \
|
|
||||||
(char *(*)())d2i_X509,PEM_STRING_X509,bp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_bio_X509_REQ(bp,x,cb,u) (X509_REQ *)PEM_ASN1_read_bio( \
|
|
||||||
(char *(*)())d2i_X509_REQ,PEM_STRING_X509_REQ,bp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_bio_X509_CRL(bp,x,cb,u) (X509_CRL *)PEM_ASN1_read_bio( \
|
|
||||||
(char *(*)())d2i_X509_CRL,PEM_STRING_X509_CRL,bp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_bio_RSAPrivateKey(bp,x,cb,u) (RSA *)PEM_ASN1_read_bio( \
|
|
||||||
(char *(*)())d2i_RSAPrivateKey,PEM_STRING_RSA,bp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_bio_RSAPublicKey(bp,x,cb,u) (RSA *)PEM_ASN1_read_bio( \
|
|
||||||
(char *(*)())d2i_RSAPublicKey,PEM_STRING_RSA_PUBLIC,bp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_bio_DSAPrivateKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
|
|
||||||
(char *(*)())d2i_DSAPrivateKey,PEM_STRING_DSA,bp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_bio_PrivateKey(bp,x,cb,u) (EVP_PKEY *)PEM_ASN1_read_bio( \
|
|
||||||
(char *(*)())d2i_PrivateKey,PEM_STRING_EVP_PKEY,bp,(char **)x,cb,u)
|
|
||||||
|
|
||||||
#define PEM_read_bio_PKCS7(bp,x,cb,u) (PKCS7 *)PEM_ASN1_read_bio( \
|
|
||||||
(char *(*)())d2i_PKCS7,PEM_STRING_PKCS7,bp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_bio_DHparams(bp,x,cb,u) (DH *)PEM_ASN1_read_bio( \
|
|
||||||
(char *(*)())d2i_DHparams,PEM_STRING_DHPARAMS,bp,(char **)x,cb,u)
|
|
||||||
#define PEM_read_bio_DSAparams(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
|
|
||||||
(char *(*)())d2i_DSAparams,PEM_STRING_DSAPARAMS,bp,(char **)x,cb,u)
|
|
||||||
|
|
||||||
#define PEM_read_bio_NETSCAPE_CERT_SEQUENCE(bp,x,cb,u) \
|
|
||||||
(NETSCAPE_CERT_SEQUENCE *)PEM_ASN1_read_bio( \
|
|
||||||
(char *(*)())d2i_NETSCAPE_CERT_SEQUENCE,PEM_STRING_X509,bp,\
|
|
||||||
(char **)x,cb,u)
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if 1
|
#if 1
|
||||||
/* "userdata": new with OpenSSL 0.9.4 */
|
/* "userdata": new with OpenSSL 0.9.4 */
|
||||||
typedef int pem_password_cb(char *buf, int size, int rwflag, void *userdata);
|
typedef int pem_password_cb(char *buf, int size, int rwflag, void *userdata);
|
||||||
@ -587,7 +455,6 @@ int PEM_def_callback(char *buf, int num, int w, void *key);
|
|||||||
void PEM_proc_type(char *buf, int type);
|
void PEM_proc_type(char *buf, int type);
|
||||||
void PEM_dek_info(char *buf, const char *type, int len, char *str);
|
void PEM_dek_info(char *buf, const char *type, int len, char *str);
|
||||||
|
|
||||||
#ifndef SSLEAY_MACROS
|
|
||||||
|
|
||||||
#include <openssl/symhacks.h>
|
#include <openssl/symhacks.h>
|
||||||
|
|
||||||
@ -676,8 +543,6 @@ int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc,
|
|||||||
EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x);
|
EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x);
|
||||||
int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x);
|
int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x);
|
||||||
|
|
||||||
#endif /* SSLEAY_MACROS */
|
|
||||||
|
|
||||||
|
|
||||||
EVP_PKEY *b2i_PrivateKey(const unsigned char **in, long length);
|
EVP_PKEY *b2i_PrivateKey(const unsigned char **in, long length);
|
||||||
EVP_PKEY *b2i_PublicKey(const unsigned char **in, long length);
|
EVP_PKEY *b2i_PublicKey(const unsigned char **in, long length);
|
||||||
|
|||||||
@ -110,7 +110,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#undef SSLEAY_MACROS
|
|
||||||
#include "cryptlib.h"
|
#include "cryptlib.h"
|
||||||
#include <openssl/bio.h>
|
#include <openssl/bio.h>
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
|
|||||||
@ -57,7 +57,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#undef SSLEAY_MACROS
|
|
||||||
#include "cryptlib.h"
|
#include "cryptlib.h"
|
||||||
#include <openssl/bio.h>
|
#include <openssl/bio.h>
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
|
|||||||
@ -57,7 +57,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#undef SSLEAY_MACROS
|
|
||||||
#include "cryptlib.h"
|
#include "cryptlib.h"
|
||||||
#include <openssl/bio.h>
|
#include <openssl/bio.h>
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
|
|||||||
@ -245,14 +245,6 @@ DECLARE_PKCS12_STACK_OF(PKCS7)
|
|||||||
|
|
||||||
#define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
|
#define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
|
||||||
|
|
||||||
#ifdef SSLEAY_MACROS
|
|
||||||
#ifndef PKCS7_ISSUER_AND_SERIAL_digest
|
|
||||||
#define PKCS7_ISSUER_AND_SERIAL_digest(data,type,md,len) \
|
|
||||||
ASN1_digest((int (*)())i2d_PKCS7_ISSUER_AND_SERIAL,type,\
|
|
||||||
(char *)data,md,len)
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* S/MIME related flags */
|
/* S/MIME related flags */
|
||||||
|
|
||||||
#define PKCS7_TEXT 0x1
|
#define PKCS7_TEXT 0x1
|
||||||
@ -286,7 +278,6 @@ DECLARE_PKCS12_STACK_OF(PKCS7)
|
|||||||
|
|
||||||
DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
|
DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
|
||||||
|
|
||||||
#ifndef SSLEAY_MACROS
|
|
||||||
int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,const EVP_MD *type,
|
int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,const EVP_MD *type,
|
||||||
unsigned char *md,unsigned int *len);
|
unsigned char *md,unsigned int *len);
|
||||||
#ifndef OPENSSL_NO_FP_API
|
#ifndef OPENSSL_NO_FP_API
|
||||||
@ -296,7 +287,6 @@ int i2d_PKCS7_fp(FILE *fp,PKCS7 *p7);
|
|||||||
PKCS7 *PKCS7_dup(PKCS7 *p7);
|
PKCS7 *PKCS7_dup(PKCS7 *p7);
|
||||||
PKCS7 *d2i_PKCS7_bio(BIO *bp,PKCS7 **p7);
|
PKCS7 *d2i_PKCS7_bio(BIO *bp,PKCS7 **p7);
|
||||||
int i2d_PKCS7_bio(BIO *bp,PKCS7 *p7);
|
int i2d_PKCS7_bio(BIO *bp,PKCS7 *p7);
|
||||||
#endif
|
|
||||||
|
|
||||||
DECLARE_ASN1_FUNCTIONS(PKCS7_SIGNER_INFO)
|
DECLARE_ASN1_FUNCTIONS(PKCS7_SIGNER_INFO)
|
||||||
DECLARE_ASN1_FUNCTIONS(PKCS7_RECIP_INFO)
|
DECLARE_ASN1_FUNCTIONS(PKCS7_RECIP_INFO)
|
||||||
|
|||||||
@ -584,151 +584,6 @@ struct pkcs8_priv_key_info_st
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef SSLEAY_MACROS
|
|
||||||
#define X509_verify(a,r) ASN1_verify((int (*)())i2d_X509_CINF,a->sig_alg,\
|
|
||||||
a->signature,(char *)a->cert_info,r)
|
|
||||||
#define X509_REQ_verify(a,r) ASN1_verify((int (*)())i2d_X509_REQ_INFO, \
|
|
||||||
a->sig_alg,a->signature,(char *)a->req_info,r)
|
|
||||||
#define X509_CRL_verify(a,r) ASN1_verify((int (*)())i2d_X509_CRL_INFO, \
|
|
||||||
a->sig_alg, a->signature,(char *)a->crl,r)
|
|
||||||
|
|
||||||
#define X509_sign(x,pkey,md) \
|
|
||||||
ASN1_sign((int (*)())i2d_X509_CINF, x->cert_info->signature, \
|
|
||||||
x->sig_alg, x->signature, (char *)x->cert_info,pkey,md)
|
|
||||||
#define X509_REQ_sign(x,pkey,md) \
|
|
||||||
ASN1_sign((int (*)())i2d_X509_REQ_INFO,x->sig_alg, NULL, \
|
|
||||||
x->signature, (char *)x->req_info,pkey,md)
|
|
||||||
#define X509_CRL_sign(x,pkey,md) \
|
|
||||||
ASN1_sign((int (*)())i2d_X509_CRL_INFO,x->crl->sig_alg,x->sig_alg, \
|
|
||||||
x->signature, (char *)x->crl,pkey,md)
|
|
||||||
#define NETSCAPE_SPKI_sign(x,pkey,md) \
|
|
||||||
ASN1_sign((int (*)())i2d_NETSCAPE_SPKAC, x->sig_algor,NULL, \
|
|
||||||
x->signature, (char *)x->spkac,pkey,md)
|
|
||||||
|
|
||||||
#define X509_dup(x509) (X509 *)ASN1_dup((int (*)())i2d_X509, \
|
|
||||||
(char *(*)())d2i_X509,(char *)x509)
|
|
||||||
#define X509_ATTRIBUTE_dup(xa) (X509_ATTRIBUTE *)ASN1_dup(\
|
|
||||||
(int (*)())i2d_X509_ATTRIBUTE, \
|
|
||||||
(char *(*)())d2i_X509_ATTRIBUTE,(char *)xa)
|
|
||||||
#define X509_EXTENSION_dup(ex) (X509_EXTENSION *)ASN1_dup( \
|
|
||||||
(int (*)())i2d_X509_EXTENSION, \
|
|
||||||
(char *(*)())d2i_X509_EXTENSION,(char *)ex)
|
|
||||||
#define d2i_X509_fp(fp,x509) (X509 *)ASN1_d2i_fp((char *(*)())X509_new, \
|
|
||||||
(char *(*)())d2i_X509, (fp),(unsigned char **)(x509))
|
|
||||||
#define i2d_X509_fp(fp,x509) ASN1_i2d_fp(i2d_X509,fp,(unsigned char *)x509)
|
|
||||||
#define d2i_X509_bio(bp,x509) (X509 *)ASN1_d2i_bio((char *(*)())X509_new, \
|
|
||||||
(char *(*)())d2i_X509, (bp),(unsigned char **)(x509))
|
|
||||||
#define i2d_X509_bio(bp,x509) ASN1_i2d_bio(i2d_X509,bp,(unsigned char *)x509)
|
|
||||||
|
|
||||||
#define X509_CRL_dup(crl) (X509_CRL *)ASN1_dup((int (*)())i2d_X509_CRL, \
|
|
||||||
(char *(*)())d2i_X509_CRL,(char *)crl)
|
|
||||||
#define d2i_X509_CRL_fp(fp,crl) (X509_CRL *)ASN1_d2i_fp((char *(*)()) \
|
|
||||||
X509_CRL_new,(char *(*)())d2i_X509_CRL, (fp),\
|
|
||||||
(unsigned char **)(crl))
|
|
||||||
#define i2d_X509_CRL_fp(fp,crl) ASN1_i2d_fp(i2d_X509_CRL,fp,\
|
|
||||||
(unsigned char *)crl)
|
|
||||||
#define d2i_X509_CRL_bio(bp,crl) (X509_CRL *)ASN1_d2i_bio((char *(*)()) \
|
|
||||||
X509_CRL_new,(char *(*)())d2i_X509_CRL, (bp),\
|
|
||||||
(unsigned char **)(crl))
|
|
||||||
#define i2d_X509_CRL_bio(bp,crl) ASN1_i2d_bio(i2d_X509_CRL,bp,\
|
|
||||||
(unsigned char *)crl)
|
|
||||||
|
|
||||||
#define PKCS7_dup(p7) (PKCS7 *)ASN1_dup((int (*)())i2d_PKCS7, \
|
|
||||||
(char *(*)())d2i_PKCS7,(char *)p7)
|
|
||||||
#define d2i_PKCS7_fp(fp,p7) (PKCS7 *)ASN1_d2i_fp((char *(*)()) \
|
|
||||||
PKCS7_new,(char *(*)())d2i_PKCS7, (fp),\
|
|
||||||
(unsigned char **)(p7))
|
|
||||||
#define i2d_PKCS7_fp(fp,p7) ASN1_i2d_fp(i2d_PKCS7,fp,\
|
|
||||||
(unsigned char *)p7)
|
|
||||||
#define d2i_PKCS7_bio(bp,p7) (PKCS7 *)ASN1_d2i_bio((char *(*)()) \
|
|
||||||
PKCS7_new,(char *(*)())d2i_PKCS7, (bp),\
|
|
||||||
(unsigned char **)(p7))
|
|
||||||
#define i2d_PKCS7_bio(bp,p7) ASN1_i2d_bio(i2d_PKCS7,bp,\
|
|
||||||
(unsigned char *)p7)
|
|
||||||
|
|
||||||
#define X509_REQ_dup(req) (X509_REQ *)ASN1_dup((int (*)())i2d_X509_REQ, \
|
|
||||||
(char *(*)())d2i_X509_REQ,(char *)req)
|
|
||||||
#define d2i_X509_REQ_fp(fp,req) (X509_REQ *)ASN1_d2i_fp((char *(*)())\
|
|
||||||
X509_REQ_new, (char *(*)())d2i_X509_REQ, (fp),\
|
|
||||||
(unsigned char **)(req))
|
|
||||||
#define i2d_X509_REQ_fp(fp,req) ASN1_i2d_fp(i2d_X509_REQ,fp,\
|
|
||||||
(unsigned char *)req)
|
|
||||||
#define d2i_X509_REQ_bio(bp,req) (X509_REQ *)ASN1_d2i_bio((char *(*)())\
|
|
||||||
X509_REQ_new, (char *(*)())d2i_X509_REQ, (bp),\
|
|
||||||
(unsigned char **)(req))
|
|
||||||
#define i2d_X509_REQ_bio(bp,req) ASN1_i2d_bio(i2d_X509_REQ,bp,\
|
|
||||||
(unsigned char *)req)
|
|
||||||
|
|
||||||
#define RSAPublicKey_dup(rsa) (RSA *)ASN1_dup((int (*)())i2d_RSAPublicKey, \
|
|
||||||
(char *(*)())d2i_RSAPublicKey,(char *)rsa)
|
|
||||||
#define RSAPrivateKey_dup(rsa) (RSA *)ASN1_dup((int (*)())i2d_RSAPrivateKey, \
|
|
||||||
(char *(*)())d2i_RSAPrivateKey,(char *)rsa)
|
|
||||||
|
|
||||||
#define d2i_RSAPrivateKey_fp(fp,rsa) (RSA *)ASN1_d2i_fp((char *(*)())\
|
|
||||||
RSA_new,(char *(*)())d2i_RSAPrivateKey, (fp), \
|
|
||||||
(unsigned char **)(rsa))
|
|
||||||
#define i2d_RSAPrivateKey_fp(fp,rsa) ASN1_i2d_fp(i2d_RSAPrivateKey,fp, \
|
|
||||||
(unsigned char *)rsa)
|
|
||||||
#define d2i_RSAPrivateKey_bio(bp,rsa) (RSA *)ASN1_d2i_bio((char *(*)())\
|
|
||||||
RSA_new,(char *(*)())d2i_RSAPrivateKey, (bp), \
|
|
||||||
(unsigned char **)(rsa))
|
|
||||||
#define i2d_RSAPrivateKey_bio(bp,rsa) ASN1_i2d_bio(i2d_RSAPrivateKey,bp, \
|
|
||||||
(unsigned char *)rsa)
|
|
||||||
|
|
||||||
#define d2i_RSAPublicKey_fp(fp,rsa) (RSA *)ASN1_d2i_fp((char *(*)())\
|
|
||||||
RSA_new,(char *(*)())d2i_RSAPublicKey, (fp), \
|
|
||||||
(unsigned char **)(rsa))
|
|
||||||
#define i2d_RSAPublicKey_fp(fp,rsa) ASN1_i2d_fp(i2d_RSAPublicKey,fp, \
|
|
||||||
(unsigned char *)rsa)
|
|
||||||
#define d2i_RSAPublicKey_bio(bp,rsa) (RSA *)ASN1_d2i_bio((char *(*)())\
|
|
||||||
RSA_new,(char *(*)())d2i_RSAPublicKey, (bp), \
|
|
||||||
(unsigned char **)(rsa))
|
|
||||||
#define i2d_RSAPublicKey_bio(bp,rsa) ASN1_i2d_bio(i2d_RSAPublicKey,bp, \
|
|
||||||
(unsigned char *)rsa)
|
|
||||||
|
|
||||||
#define d2i_DSAPrivateKey_fp(fp,dsa) (DSA *)ASN1_d2i_fp((char *(*)())\
|
|
||||||
DSA_new,(char *(*)())d2i_DSAPrivateKey, (fp), \
|
|
||||||
(unsigned char **)(dsa))
|
|
||||||
#define i2d_DSAPrivateKey_fp(fp,dsa) ASN1_i2d_fp(i2d_DSAPrivateKey,fp, \
|
|
||||||
(unsigned char *)dsa)
|
|
||||||
#define d2i_DSAPrivateKey_bio(bp,dsa) (DSA *)ASN1_d2i_bio((char *(*)())\
|
|
||||||
DSA_new,(char *(*)())d2i_DSAPrivateKey, (bp), \
|
|
||||||
(unsigned char **)(dsa))
|
|
||||||
#define i2d_DSAPrivateKey_bio(bp,dsa) ASN1_i2d_bio(i2d_DSAPrivateKey,bp, \
|
|
||||||
(unsigned char *)dsa)
|
|
||||||
|
|
||||||
#define d2i_ECPrivateKey_fp(fp,ecdsa) (EC_KEY *)ASN1_d2i_fp((char *(*)())\
|
|
||||||
EC_KEY_new,(char *(*)())d2i_ECPrivateKey, (fp), \
|
|
||||||
(unsigned char **)(ecdsa))
|
|
||||||
#define i2d_ECPrivateKey_fp(fp,ecdsa) ASN1_i2d_fp(i2d_ECPrivateKey,fp, \
|
|
||||||
(unsigned char *)ecdsa)
|
|
||||||
#define d2i_ECPrivateKey_bio(bp,ecdsa) (EC_KEY *)ASN1_d2i_bio((char *(*)())\
|
|
||||||
EC_KEY_new,(char *(*)())d2i_ECPrivateKey, (bp), \
|
|
||||||
(unsigned char **)(ecdsa))
|
|
||||||
#define i2d_ECPrivateKey_bio(bp,ecdsa) ASN1_i2d_bio(i2d_ECPrivateKey,bp, \
|
|
||||||
(unsigned char *)ecdsa)
|
|
||||||
|
|
||||||
#define X509_ALGOR_dup(xn) (X509_ALGOR *)ASN1_dup((int (*)())i2d_X509_ALGOR,\
|
|
||||||
(char *(*)())d2i_X509_ALGOR,(char *)xn)
|
|
||||||
|
|
||||||
#define X509_NAME_dup(xn) (X509_NAME *)ASN1_dup((int (*)())i2d_X509_NAME, \
|
|
||||||
(char *(*)())d2i_X509_NAME,(char *)xn)
|
|
||||||
#define X509_NAME_ENTRY_dup(ne) (X509_NAME_ENTRY *)ASN1_dup( \
|
|
||||||
(int (*)())i2d_X509_NAME_ENTRY, \
|
|
||||||
(char *(*)())d2i_X509_NAME_ENTRY,\
|
|
||||||
(char *)ne)
|
|
||||||
|
|
||||||
#define X509_digest(data,type,md,len) \
|
|
||||||
ASN1_digest((int (*)())i2d_X509,type,(char *)data,md,len)
|
|
||||||
#define X509_NAME_digest(data,type,md,len) \
|
|
||||||
ASN1_digest((int (*)())i2d_X509_NAME,type,(char *)data,md,len)
|
|
||||||
#ifndef PKCS7_ISSUER_AND_SERIAL_digest
|
|
||||||
#define PKCS7_ISSUER_AND_SERIAL_digest(data,type,md,len) \
|
|
||||||
ASN1_digest((int (*)())i2d_PKCS7_ISSUER_AND_SERIAL,type,\
|
|
||||||
(char *)data,md,len)
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define X509_EXT_PACK_UNKNOWN 1
|
#define X509_EXT_PACK_UNKNOWN 1
|
||||||
#define X509_EXT_PACK_STRING 2
|
#define X509_EXT_PACK_STRING 2
|
||||||
|
|
||||||
@ -772,7 +627,6 @@ IMPLEMENT_ASN1_SET_OF(X509_CRL)
|
|||||||
|
|
||||||
const char *X509_verify_cert_error_string(long n);
|
const char *X509_verify_cert_error_string(long n);
|
||||||
|
|
||||||
#ifndef SSLEAY_MACROS
|
|
||||||
#ifndef OPENSSL_NO_EVP
|
#ifndef OPENSSL_NO_EVP
|
||||||
int X509_verify(X509 *a, EVP_PKEY *r);
|
int X509_verify(X509 *a, EVP_PKEY *r);
|
||||||
|
|
||||||
@ -897,8 +751,6 @@ void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval,
|
|||||||
X509_NAME *X509_NAME_dup(X509_NAME *xn);
|
X509_NAME *X509_NAME_dup(X509_NAME *xn);
|
||||||
X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);
|
X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);
|
||||||
|
|
||||||
#endif /* !SSLEAY_MACROS */
|
|
||||||
|
|
||||||
int X509_cmp_time(ASN1_TIME *s, time_t *t);
|
int X509_cmp_time(ASN1_TIME *s, time_t *t);
|
||||||
int X509_cmp_current_time(ASN1_TIME *s);
|
int X509_cmp_current_time(ASN1_TIME *s);
|
||||||
ASN1_TIME * X509_time_adj(ASN1_TIME *s, long adj, time_t *t);
|
ASN1_TIME * X509_time_adj(ASN1_TIME *s, long adj, time_t *t);
|
||||||
|
|||||||
@ -57,7 +57,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#undef SSLEAY_MACROS
|
|
||||||
#include <openssl/stack.h>
|
#include <openssl/stack.h>
|
||||||
#include "cryptlib.h"
|
#include "cryptlib.h"
|
||||||
#include <openssl/buffer.h>
|
#include <openssl/buffer.h>
|
||||||
|
|||||||
@ -1195,7 +1195,6 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
|
|||||||
#define SSL_get_timeout(a) SSL_SESSION_get_timeout(a)
|
#define SSL_get_timeout(a) SSL_SESSION_get_timeout(a)
|
||||||
#define SSL_set_timeout(a,b) SSL_SESSION_set_timeout((a),(b))
|
#define SSL_set_timeout(a,b) SSL_SESSION_set_timeout((a),(b))
|
||||||
|
|
||||||
#if 1 /*SSLEAY_MACROS*/
|
|
||||||
#define d2i_SSL_SESSION_bio(bp,s_id) ASN1_d2i_bio_of(SSL_SESSION,SSL_SESSION_new,d2i_SSL_SESSION,bp,s_id)
|
#define d2i_SSL_SESSION_bio(bp,s_id) ASN1_d2i_bio_of(SSL_SESSION,SSL_SESSION_new,d2i_SSL_SESSION,bp,s_id)
|
||||||
#define i2d_SSL_SESSION_bio(bp,s_id) ASN1_i2d_bio_of(SSL_SESSION,i2d_SSL_SESSION,bp,s_id)
|
#define i2d_SSL_SESSION_bio(bp,s_id) ASN1_i2d_bio_of(SSL_SESSION,i2d_SSL_SESSION,bp,s_id)
|
||||||
#define PEM_read_SSL_SESSION(fp,x,cb,u) (SSL_SESSION *)PEM_ASN1_read( \
|
#define PEM_read_SSL_SESSION(fp,x,cb,u) (SSL_SESSION *)PEM_ASN1_read( \
|
||||||
@ -1206,7 +1205,6 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
|
|||||||
PEM_STRING_SSL_SESSION,fp, (char *)x, NULL,NULL,0,NULL,NULL)
|
PEM_STRING_SSL_SESSION,fp, (char *)x, NULL,NULL,0,NULL,NULL)
|
||||||
#define PEM_write_bio_SSL_SESSION(bp,x) \
|
#define PEM_write_bio_SSL_SESSION(bp,x) \
|
||||||
PEM_ASN1_write_bio_of(SSL_SESSION,i2d_SSL_SESSION,PEM_STRING_SSL_SESSION,bp,x,NULL,NULL,0,NULL,NULL)
|
PEM_ASN1_write_bio_of(SSL_SESSION,i2d_SSL_SESSION,PEM_STRING_SSL_SESSION,bp,x,NULL,NULL,0,NULL,NULL)
|
||||||
#endif
|
|
||||||
|
|
||||||
#define SSL_AD_REASON_OFFSET 1000 /* offset to get SSL_R_... value from SSL_AD_... */
|
#define SSL_AD_REASON_OFFSET 1000 /* offset to get SSL_R_... value from SSL_AD_... */
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user