projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document rollback issues.
[openssl.git]
/
ssl
/
ssl_txt.c
diff --git
a/ssl/ssl_txt.c
b/ssl/ssl_txt.c
index 22fbb5f55b254298d164a8f5560189405297e39d..6e33eec3e4f7de3c0d862d1927d6038484759743 100644
(file)
--- a/
ssl/ssl_txt.c
+++ b/
ssl/ssl_txt.c
@@
-57,35
+57,31
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include
"buffer.h"
+#include
<openssl/buffer.h>
#include "ssl_locl.h"
#ifndef NO_FP_API
#include "ssl_locl.h"
#ifndef NO_FP_API
-int SSL_SESSION_print_fp(fp, x)
-FILE *fp;
-SSL_SESSION *x;
- {
- BIO *b;
- int ret;
+int SSL_SESSION_print_fp(FILE *fp, SSL_SESSION *x)
+ {
+ BIO *b;
+ int ret;
-
if ((b=BIO_new(BIO_s_file_internal())) == NULL)
+ if ((b=BIO_new(BIO_s_file_internal())) == NULL)
{
SSLerr(SSL_F_SSL_SESSION_PRINT_FP,ERR_R_BUF_LIB);
{
SSLerr(SSL_F_SSL_SESSION_PRINT_FP,ERR_R_BUF_LIB);
-
return(0);
+ return(0);
}
}
-
BIO_set_fp(b,fp,BIO_NOCLOSE);
-
ret=SSL_SESSION_print(b,x);
-
BIO_free(b);
-
return(ret);
-
}
+ BIO_set_fp(b,fp,BIO_NOCLOSE);
+ ret=SSL_SESSION_print(b,x);
+ BIO_free(b);
+ return(ret);
+ }
#endif
#endif
-int SSL_SESSION_print(bp,x)
-BIO *bp;
-SSL_SESSION *x;
+int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
{
unsigned int i;
{
unsigned int i;
- char
str[128],
*s;
+ char *s;
if (x == NULL) goto err;
if (BIO_puts(bp,"SSL-Session:\n") <= 0) goto err;
if (x == NULL) goto err;
if (BIO_puts(bp,"SSL-Session:\n") <= 0) goto err;
@@
-97,36
+93,41
@@
SSL_SESSION *x;
s="TLSv1";
else
s="unknown";
s="TLSv1";
else
s="unknown";
- sprintf(str," Protocol : %s\n",s);
- if (BIO_puts(bp,str) <= 0) goto err;
+ if (BIO_printf(bp," Protocol : %s\n",s) <= 0) goto err;
if (x->cipher == NULL)
{
if (((x->cipher_id) & 0xff000000) == 0x02000000)
if (x->cipher == NULL)
{
if (((x->cipher_id) & 0xff000000) == 0x02000000)
- sprintf(str," Cipher : %06lX\n",x->cipher_id&0xffffff);
+ {
+ if (BIO_printf(bp," Cipher : %06lX\n",x->cipher_id&0xffffff) <= 0)
+ goto err;
+ }
else
else
- sprintf(str," Cipher : %04lX\n",x->cipher_id&0xffff);
+ {
+ if (BIO_printf(bp," Cipher : %04lX\n",x->cipher_id&0xffff) <= 0)
+ goto err;
+ }
}
else
}
else
- sprintf(str," Cipher : %s\n",(x->cipher == NULL)?"unknown":x->cipher->name);
- if (BIO_puts(bp,str) <= 0) goto err;
+ {
+ if (BIO_printf(bp," Cipher : %s\n",((x->cipher == NULL)?"unknown":x->cipher->name)) <= 0)
+ goto err;
+ }
if (BIO_puts(bp," Session-ID: ") <= 0) goto err;
for (i=0; i<x->session_id_length; i++)
{
if (BIO_puts(bp," Session-ID: ") <= 0) goto err;
for (i=0; i<x->session_id_length; i++)
{
- sprintf(str,"%02X",x->session_id[i]);
- if (BIO_puts(bp,str) <= 0) goto err;
+ if (BIO_printf(bp,"%02X",x->session_id[i]) <= 0) goto err;
}
}
- if (BIO_puts(bp,"\nSession-ID-ctx: ") <= 0) goto err;
+ if (BIO_puts(bp,"\n
Session-ID-ctx: ") <= 0) goto err;
for (i=0; i<x->sid_ctx_length; i++)
{
for (i=0; i<x->sid_ctx_length; i++)
{
- sprintf(str,"%02X",x->sid_ctx[i]);
-
if (BIO_puts(bp,str) <= 0)
goto err;
+ if (BIO_printf(bp,"%02X",x->sid_ctx[i]) <= 0)
+
goto err;
}
if (BIO_puts(bp,"\n Master-Key: ") <= 0) goto err;
for (i=0; i<(unsigned int)x->master_key_length; i++)
{
}
if (BIO_puts(bp,"\n Master-Key: ") <= 0) goto err;
for (i=0; i<(unsigned int)x->master_key_length; i++)
{
- sprintf(str,"%02X",x->master_key[i]);
- if (BIO_puts(bp,str) <= 0) goto err;
+ if (BIO_printf(bp,"%02X",x->master_key[i]) <= 0) goto err;
}
if (BIO_puts(bp,"\n Key-Arg : ") <= 0) goto err;
if (x->key_arg_length == 0)
}
if (BIO_puts(bp,"\n Key-Arg : ") <= 0) goto err;
if (x->key_arg_length == 0)
@@
-136,8
+137,7
@@
SSL_SESSION *x;
else
for (i=0; i<x->key_arg_length; i++)
{
else
for (i=0; i<x->key_arg_length; i++)
{
- sprintf(str,"%02X",x->key_arg[i]);
- if (BIO_puts(bp,str) <= 0) goto err;
+ if (BIO_printf(bp,"%02X",x->key_arg[i]) <= 0) goto err;
}
if (x->compress_meth != 0)
{
}
if (x->compress_meth != 0)
{
@@
-146,27
+146,26
@@
SSL_SESSION *x;
ssl_cipher_get_evp(x,NULL,NULL,&comp);
if (comp == NULL)
{
ssl_cipher_get_evp(x,NULL,NULL,&comp);
if (comp == NULL)
{
- sprintf(str,"\n Compression: %d",x->compress_meth);
- if (BIO_puts(bp,str) <= 0) goto err;
+ if (BIO_printf(bp,"\n Compression: %d",x->compress_meth) <= 0) goto err;
}
else
{
}
else
{
- sprintf(str,"\n Compression: %d (%s)",
- comp->id,comp->method->name);
- if (BIO_puts(bp,str) <= 0) goto err;
+ if (BIO_printf(bp,"\n Compression: %d (%s)", comp->id,comp->method->name) <= 0) goto err;
}
}
if (x->time != 0L)
{
}
}
if (x->time != 0L)
{
- sprintf(str,"\n Start Time: %ld",x->time);
- if (BIO_puts(bp,str) <= 0) goto err;
+ if (BIO_printf(bp, "\n Start Time: %ld",x->time) <= 0) goto err;
}
if (x->timeout != 0L)
{
}
if (x->timeout != 0L)
{
- sprintf(str,"\n Timeout : %ld (sec)",x->timeout);
- if (BIO_puts(bp,str) <= 0) goto err;
+ if (BIO_printf(bp, "\n Timeout : %ld (sec)",x->timeout) <= 0) goto err;
}
if (BIO_puts(bp,"\n") <= 0) goto err;
}
if (BIO_puts(bp,"\n") <= 0) goto err;
+
+ if (BIO_puts(bp, " Verify return code: ") <= 0) goto err;
+ if (BIO_printf(bp, "%ld (%s)\n", x->verify_result,
+ X509_verify_cert_error_string(x->verify_result)) <= 0) goto err;
return(1);
err:
return(1);
err: