projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ssl/s3_pkt.c: move multi-block processing to ssl3_write_bytes.
[openssl.git]
/
ssl
/
ssl_asn1.c
diff --git
a/ssl/ssl_asn1.c
b/ssl/ssl_asn1.c
index 8fa8c669b19ff9d8fdbdf7a28599ab33f6339821..38540be1e5380615391037e67a02fe8ae3816641 100644
(file)
--- a/
ssl/ssl_asn1.c
+++ b/
ssl/ssl_asn1.c
@@
-84,7
+84,6
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <openssl/crypto.h>
#include "ssl_locl.h"
#include <openssl/asn1_mac.h>
#include <openssl/objects.h>
#include "ssl_locl.h"
#include <openssl/asn1_mac.h>
#include <openssl/objects.h>
@@
-627,7
+626,7
@@
SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
#ifndef OPENSSL_NO_SRP
os.length=0;
os.data=NULL;
#ifndef OPENSSL_NO_SRP
os.length=0;
os.data=NULL;
- M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,1
1
);
+ M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,1
2
);
if (os.data)
{
ret->srp_username = BUF_strndup((char *)os.data, os.length);
if (os.data)
{
ret->srp_username = BUF_strndup((char *)os.data, os.length);