projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use certificate tables instead of ssl_cert_type
[openssl.git]
/
ssl
/
ssl_rsa.c
diff --git
a/ssl/ssl_rsa.c
b/ssl/ssl_rsa.c
index 6f1c380b9bfe49ad3c4be10c98a5a46964eda25e..89aaa9d06e66e0448d4722026568936971df2e8d 100644
(file)
--- a/
ssl/ssl_rsa.c
+++ b/
ssl/ssl_rsa.c
@@
-127,9
+127,9
@@
int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa)
static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
{
static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
{
-
in
t i;
- i = ssl_cert_type(NULL, pkey);
- if (
i < 0
) {
+
size_
t i;
+
+ if (
ssl_cert_lookup_by_pkey(pkey, &i) == NULL
) {
SSLerr(SSL_F_SSL_SET_PKEY, SSL_R_UNKNOWN_CERTIFICATE_TYPE);
return (0);
}
SSLerr(SSL_F_SSL_SET_PKEY, SSL_R_UNKNOWN_CERTIFICATE_TYPE);
return (0);
}
@@
-167,8
+167,8
@@
static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
EVP_PKEY_free(c->pkeys[i].privatekey);
EVP_PKEY_up_ref(pkey);
c->pkeys[i].privatekey = pkey;
EVP_PKEY_free(c->pkeys[i].privatekey);
EVP_PKEY_up_ref(pkey);
c->pkeys[i].privatekey = pkey;
- c->key = &
(c->pkeys[i])
;
- return
(1)
;
+ c->key = &
c->pkeys[i]
;
+ return
1
;
}
#ifndef OPENSSL_NO_RSA
}
#ifndef OPENSSL_NO_RSA
@@
-316,7
+316,7
@@
int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x)
static int ssl_set_cert(CERT *c, X509 *x)
{
EVP_PKEY *pkey;
static int ssl_set_cert(CERT *c, X509 *x)
{
EVP_PKEY *pkey;
-
in
t i;
+
size_
t i;
pkey = X509_get0_pubkey(x);
if (pkey == NULL) {
pkey = X509_get0_pubkey(x);
if (pkey == NULL) {
@@
-324,8
+324,7
@@
static int ssl_set_cert(CERT *c, X509 *x)
return (0);
}
return (0);
}
- i = ssl_cert_type(x, pkey);
- if (i < 0) {
+ if (ssl_cert_lookup_by_pkey(pkey, &i) == NULL) {
SSLerr(SSL_F_SSL_SET_CERT, SSL_R_UNKNOWN_CERTIFICATE_TYPE);
return 0;
}
SSLerr(SSL_F_SSL_SET_CERT, SSL_R_UNKNOWN_CERTIFICATE_TYPE);
return 0;
}
@@
-775,7
+774,7
@@
static int serverinfoex_srv_add_cb(SSL *s, unsigned int ext_type,
int retval = serverinfo_find_extension(serverinfo, serverinfo_length,
ext_type, out, outlen);
if (retval == -1) {
int retval = serverinfo_find_extension(serverinfo, serverinfo_length,
ext_type, out, outlen);
if (retval == -1) {
- *al = SSL_AD_
DECODE
_ERROR;
+ *al = SSL_AD_
INTERNAL
_ERROR;
return -1; /* Error */
}
if (retval == 0)
return -1; /* Error */
}
if (retval == 0)