diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-15 16:22:58 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-15 16:22:58 +0100 |
| commit | 18fef7c99aa36b3e5622b3865f36d78d0879e92d (patch) | |
| tree | 7a04fc87318d5008bbc1f1ac145ebb505bb5238c /app/openssl/ssl/t1_enc.c | |
| parent | 56fe0400b8983ce57112ed5a0f993985a87741c0 (diff) | |
| parent | 33c5958a18599267820f73b151d8161d83f93d88 (diff) | |
Merge branch 'research/Test-on-Android-5-#6543' into develop
Diffstat (limited to 'app/openssl/ssl/t1_enc.c')
| -rw-r--r-- | app/openssl/ssl/t1_enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/openssl/ssl/t1_enc.c b/app/openssl/ssl/t1_enc.c index 22dd3cab..455992ad 100644 --- a/app/openssl/ssl/t1_enc.c +++ b/app/openssl/ssl/t1_enc.c @@ -1153,7 +1153,7 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, int rv; #ifdef KSSL_DEBUG - printf ("tls1_export_keying_material(%p,%p,%d,%s,%d,%p,%d)\n", s, out, olen, label, llen, p, plen); + printf ("tls1_export_keying_material(%p,%p,%d,%s,%d,%p,%d)\n", s, out, olen, label, llen, context, contextlen); #endif /* KSSL_DEBUG */ buff = OPENSSL_malloc(olen); @@ -1266,6 +1266,7 @@ int tls1_alert_code(int code) case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE: return(TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE); case SSL_AD_BAD_CERTIFICATE_HASH_VALUE: return(TLS1_AD_BAD_CERTIFICATE_HASH_VALUE); case SSL_AD_UNKNOWN_PSK_IDENTITY:return(TLS1_AD_UNKNOWN_PSK_IDENTITY); + case SSL_AD_INAPPROPRIATE_FALLBACK:return(TLS1_AD_INAPPROPRIATE_FALLBACK); #if 0 /* not appropriate for TLS, not used for DTLS */ case DTLS1_AD_MISSING_HANDSHAKE_MESSAGE: return (DTLS1_AD_MISSING_HANDSHAKE_MESSAGE); |