diff options
Diffstat (limited to 'lib/libssl/src/ssl/ssl_asn1.c')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_asn1.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lib/libssl/src/ssl/ssl_asn1.c b/lib/libssl/src/ssl/ssl_asn1.c index cb52864bf3b..b60b3ea3f81 100644 --- a/lib/libssl/src/ssl/ssl_asn1.c +++ b/lib/libssl/src/ssl/ssl_asn1.c @@ -1,25 +1,25 @@ -/* $OpenBSD: ssl_asn1.c,v 1.39 2014/10/20 12:55:21 bcook Exp $ */ +/* $OpenBSD: ssl_asn1.c,v 1.40 2014/12/14 15:30:50 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * The implementation was written so as to conform with Netscapes SSL. - * + * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * + * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,10 +34,10 @@ * Eric Young (eay@cryptsoft.com)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * + * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -49,7 +49,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence @@ -141,7 +141,7 @@ i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp) a.time.type = V_ASN1_INTEGER; a.time.data = ibuf3; ASN1_INTEGER_set(&(a.time), in->time); /* XXX 2038 */ - v1 = i2d_ASN1_INTEGER(&(a.time), NULL); + v1 = i2d_ASN1_INTEGER(&(a.time), NULL); len += ASN1_object_size(1, v1, 1); } @@ -150,19 +150,19 @@ i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp) a.timeout.type = V_ASN1_INTEGER; a.timeout.data = ibuf4; ASN1_INTEGER_set(&(a.timeout), in->timeout); - v2 = i2d_ASN1_INTEGER(&(a.timeout), NULL); + v2 = i2d_ASN1_INTEGER(&(a.timeout), NULL); len += ASN1_object_size(1, v2, 2); } if (in->peer != NULL) { - v3 = i2d_X509(in->peer, NULL); + v3 = i2d_X509(in->peer, NULL); len += ASN1_object_size(1, v3, 3); } a.session_id_context.length = in->sid_ctx_length; a.session_id_context.type = V_ASN1_OCTET_STRING; a.session_id_context.data = in->sid_ctx; - v4 = i2d_ASN1_OCTET_STRING(&(a.session_id_context), NULL); + v4 = i2d_ASN1_OCTET_STRING(&(a.session_id_context), NULL); len += ASN1_object_size(1, v4, 4); if (in->verify_result != X509_V_OK) { @@ -170,7 +170,7 @@ i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp) a.verify_result.type = V_ASN1_INTEGER; a.verify_result.data = ibuf5; ASN1_INTEGER_set(&a.verify_result, in->verify_result); - v5 = i2d_ASN1_INTEGER(&(a.verify_result), NULL); + v5 = i2d_ASN1_INTEGER(&(a.verify_result), NULL); len += ASN1_object_size(1, v5, 5); } @@ -178,7 +178,7 @@ i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp) a.tlsext_hostname.length = strlen(in->tlsext_hostname); a.tlsext_hostname.type = V_ASN1_OCTET_STRING; a.tlsext_hostname.data = (unsigned char *)in->tlsext_hostname; - v6 = i2d_ASN1_OCTET_STRING(&(a.tlsext_hostname), NULL); + v6 = i2d_ASN1_OCTET_STRING(&(a.tlsext_hostname), NULL); len += ASN1_object_size(1, v6, 6); } @@ -191,7 +191,7 @@ i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp) a.tlsext_tick_lifetime.data = ibuf6; ASN1_INTEGER_set(&a.tlsext_tick_lifetime, in->tlsext_tick_lifetime_hint); - v9 = i2d_ASN1_INTEGER(&(a.tlsext_tick_lifetime), NULL); + v9 = i2d_ASN1_INTEGER(&(a.tlsext_tick_lifetime), NULL); len += ASN1_object_size(1, v9, 9); } @@ -199,7 +199,7 @@ i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp) a.tlsext_tick.length = in->tlsext_ticklen; a.tlsext_tick.type = V_ASN1_OCTET_STRING; a.tlsext_tick.data = (unsigned char *)in->tlsext_tick; - v10 = i2d_ASN1_OCTET_STRING(&(a.tlsext_tick), NULL); + v10 = i2d_ASN1_OCTET_STRING(&(a.tlsext_tick), NULL); len += ASN1_object_size(1, v10, 10); } |