diff options
| author |   tedu <tedu@openbsd.org> | 2014-04-17 21:37:37 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-04-17 21:37:37 +0000 |
| commit | f9cd3d10235bfe2564dce844f01425b5129af89a (patch) | |
| tree | 59a1f3426b9d422136eaa74ec4dcab48b5cb7bc6 /lib/libssl/ssl_rsa.c | |
| parent | kill REF_PRINT/REF_CHECK debugging framework noone would use (diff) | |
| download | wireguard-openbsd-f9cd3d10235bfe2564dce844f01425b5129af89a.tar.xz wireguard-openbsd-f9cd3d10235bfe2564dce844f01425b5129af89a.zip | |
always build in RSA and DSA. ok deraadt miod
Diffstat (limited to 'lib/libssl/ssl_rsa.c')
| -rw-r--r-- | lib/libssl/ssl_rsa.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/libssl/ssl_rsa.c b/lib/libssl/ssl_rsa.c index 078df55f06a..05d18de1d99 100644 --- a/lib/libssl/ssl_rsa.c +++ b/lib/libssl/ssl_rsa.c @@ -142,7 +142,6 @@ SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len) return (ret); } -#ifndef OPENSSL_NO_RSA int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa) { @@ -169,7 +168,6 @@ SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa) EVP_PKEY_free(pkey); return (ret); } -#endif static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey) @@ -189,14 +187,12 @@ ssl_set_pkey(CERT *c, EVP_PKEY *pkey) EVP_PKEY_free(pktmp); ERR_clear_error(); -#ifndef OPENSSL_NO_RSA /* Don't check the public/private key, this is mostly * for smart cards. */ if ((pkey->type == EVP_PKEY_RSA) && (RSA_flags(pkey->pkey.rsa) & RSA_METHOD_FLAG_NO_CHECK)) ; else -#endif if (!X509_check_private_key(c->pkeys[i].x509, pkey)) { X509_free(c->pkeys[i].x509); c->pkeys[i].x509 = NULL; @@ -214,7 +210,6 @@ ssl_set_pkey(CERT *c, EVP_PKEY *pkey) return (1); } -#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_STDIO int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type) @@ -274,7 +269,6 @@ SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len) RSA_free(rsa); return (ret); } -#endif /* !OPENSSL_NO_RSA */ int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey) @@ -390,7 +384,6 @@ ssl_set_cert(CERT *c, X509 *x) EVP_PKEY_copy_parameters(pkey, c->pkeys[i].privatekey); ERR_clear_error(); -#ifndef OPENSSL_NO_RSA /* Don't check the public/private key, this is mostly * for smart cards. */ if ((c->pkeys[i].privatekey->type == EVP_PKEY_RSA) && @@ -398,7 +391,6 @@ ssl_set_cert(CERT *c, X509 *x) RSA_METHOD_FLAG_NO_CHECK)) ; else -#endif /* OPENSSL_NO_RSA */ if (!X509_check_private_key(x, c->pkeys[i].privatekey)) { /* don't fail for a cert/key mismatch, just free * current private key (when switching to a different @@ -485,7 +477,6 @@ SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, const unsigned char *d) return (ret); } -#ifndef OPENSSL_NO_RSA int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa) { @@ -572,7 +563,6 @@ SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d, long len) RSA_free(rsa); return (ret); } -#endif /* !OPENSSL_NO_RSA */ int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey) |