diff options
| author | Ulf Möller <ulf@openssl.org> | 1999-04-27 01:14:46 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 1999-04-27 01:14:46 +0000 |
| commit | f5d7a031a3c3e7b1700a67d6dc19daf3718ce6ee (patch) | |
| tree | f5db72824de4586c35cef513ed48aff0d4b69a6b /crypto/x509 | |
| parent | b64f825671861144e1c24f2a5498a95a083021cd (diff) | |
| download | openssl-f5d7a031a3c3e7b1700a67d6dc19daf3718ce6ee.tar.gz | |
New Configure option no-<cipher> (rsa, idea, rc5, ...).
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/x509/x509.h | 24 |
2 files changed, 15 insertions, 11 deletions
diff --git a/crypto/x509/Makefile.ssl b/crypto/x509/Makefile.ssl index c724a74f9b..1fc144f165 100644 --- a/crypto/x509/Makefile.ssl +++ b/crypto/x509/Makefile.ssl @@ -75,7 +75,7 @@ lint: lint -DLINT $(INCLUDES) $(SRC)>fluff depend: - $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) + $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC) dclean: $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index 1ba0be7786..7c3ab2fedb 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -69,20 +69,14 @@ extern "C" { #ifndef NO_RSA #include <openssl/rsa.h> -#else -#define RSA long #endif #ifndef NO_DSA #include <openssl/dsa.h> -#else -#define DSA long #endif #ifndef NO_DH #include <openssl/dh.h> -#else -#define DH long #endif #include <openssl/evp.h> @@ -549,13 +543,17 @@ X509_CRL *d2i_X509_CRL_fp(FILE *fp,X509_CRL *crl); int i2d_X509_CRL_fp(FILE *fp,X509_CRL *crl); X509_REQ *d2i_X509_REQ_fp(FILE *fp,X509_REQ *req); int i2d_X509_REQ_fp(FILE *fp,X509_REQ *req); +#ifndef NO_RSA RSA *d2i_RSAPrivateKey_fp(FILE *fp,RSA *rsa); int i2d_RSAPrivateKey_fp(FILE *fp,RSA *rsa); -DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA *dsa); -int i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa); RSA *d2i_RSAPublicKey_fp(FILE *fp,RSA *rsa); int i2d_RSAPublicKey_fp(FILE *fp,RSA *rsa); #endif +#ifndef NO_DSA +DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA *dsa); +int i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa); +#endif +#endif #ifdef HEADER_BIO_H X509 *d2i_X509_bio(BIO *bp,X509 *x509); @@ -564,13 +562,17 @@ X509_CRL *d2i_X509_CRL_bio(BIO *bp,X509_CRL *crl); int i2d_X509_CRL_bio(BIO *bp,X509_CRL *crl); X509_REQ *d2i_X509_REQ_bio(BIO *bp,X509_REQ *req); int i2d_X509_REQ_bio(BIO *bp,X509_REQ *req); +#ifndef NO_RSA RSA *d2i_RSAPrivateKey_bio(BIO *bp,RSA *rsa); int i2d_RSAPrivateKey_bio(BIO *bp,RSA *rsa); -DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA *dsa); -int i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa); RSA *d2i_RSAPublicKey_bio(BIO *bp,RSA *rsa); int i2d_RSAPublicKey_bio(BIO *bp,RSA *rsa); #endif +#ifndef NO_DSA +DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA *dsa); +int i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa); +#endif +#endif X509 *X509_dup(X509 *x509); X509_ATTRIBUTE *X509_ATTRIBUTE_dup(X509_ATTRIBUTE *xa); @@ -580,8 +582,10 @@ X509_REQ *X509_REQ_dup(X509_REQ *req); X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn); X509_NAME *X509_NAME_dup(X509_NAME *xn); X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne); +#ifndef NO_RSA RSA *RSAPublicKey_dup(RSA *rsa); RSA *RSAPrivateKey_dup(RSA *rsa); +#endif #endif /* !SSLEAY_MACROS */ |