projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New ctrl values to clear or retrieve extra chain certs from an SSL_CTX.
[openssl.git]
/
apps
/
s_server.c
diff --git
a/apps/s_server.c
b/apps/s_server.c
index 59e16ec34845d3239a5fa968dee27aa62d9f4004..4e9d420c44bc97998d13c1650c7eb3d176156e73 100644
(file)
--- a/
apps/s_server.c
+++ b/
apps/s_server.c
@@
-3002,10
+3002,10
@@
static int add_session(SSL *ssl, SSL_SESSION *session)
sess = OPENSSL_malloc(sizeof(simple_ssl_session));
sess = OPENSSL_malloc(sizeof(simple_ssl_session));
-
sess->idlen = SSL_SESSION_get_id_len(sessio
n);
+
SSL_SESSION_get_id(session, &sess->idle
n);
sess->derlen = i2d_SSL_SESSION(session, NULL);
sess->derlen = i2d_SSL_SESSION(session, NULL);
- sess->id = BUF_memdup(SSL_SESSION_get
0_id(session
), sess->idlen);
+ sess->id = BUF_memdup(SSL_SESSION_get
_id(session, NULL
), sess->idlen);
sess->der = OPENSSL_malloc(sess->derlen);
p = sess->der;
sess->der = OPENSSL_malloc(sess->derlen);
p = sess->der;
@@
-3038,8
+3038,9
@@
static SSL_SESSION *get_session(SSL *ssl, unsigned char *id, int idlen,
static void del_session(SSL_CTX *sctx, SSL_SESSION *session)
{
simple_ssl_session *sess, *prev = NULL;
static void del_session(SSL_CTX *sctx, SSL_SESSION *session)
{
simple_ssl_session *sess, *prev = NULL;
- const unsigned char *id = SSL_SESSION_get0_id(session);
- unsigned int idlen = SSL_SESSION_get_id_len(session);
+ const unsigned char *id;
+ unsigned int idlen;
+ id = SSL_SESSION_get_id(session, &idlen);
for (sess = first; sess; sess = sess->next)
{
if (idlen == sess->idlen && !memcmp(sess->id, id, idlen))
for (sess = first; sess; sess = sess->next)
{
if (idlen == sess->idlen && !memcmp(sess->id, id, idlen))