diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/bytestring.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/libssl/bytestring.h b/src/lib/libssl/bytestring.h index 8ea84005b4..d8c8e6ada6 100644 --- a/src/lib/libssl/bytestring.h +++ b/src/lib/libssl/bytestring.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bytestring.h,v 1.14 2015/06/19 00:23:36 doug Exp $ */ | 1 | /* $OpenBSD: bytestring.h,v 1.15 2016/11/04 18:28:58 guenther Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014, Google Inc. | 3 | * Copyright (c) 2014, Google Inc. |
| 4 | * | 4 | * |
| @@ -17,15 +17,13 @@ | |||
| 17 | #ifndef OPENSSL_HEADER_BYTESTRING_H | 17 | #ifndef OPENSSL_HEADER_BYTESTRING_H |
| 18 | #define OPENSSL_HEADER_BYTESTRING_H | 18 | #define OPENSSL_HEADER_BYTESTRING_H |
| 19 | 19 | ||
| 20 | #if defined(__cplusplus) | ||
| 21 | extern "C" { | ||
| 22 | #endif | ||
| 23 | |||
| 24 | #include <sys/types.h> | 20 | #include <sys/types.h> |
| 25 | #include <stdint.h> | 21 | #include <stdint.h> |
| 26 | 22 | ||
| 27 | #include <openssl/opensslconf.h> | 23 | #include <openssl/opensslconf.h> |
| 28 | 24 | ||
| 25 | __BEGIN_HIDDEN_DECLS | ||
| 26 | |||
| 29 | /* | 27 | /* |
| 30 | * Bytestrings are used for parsing and building TLS and ASN.1 messages. | 28 | * Bytestrings are used for parsing and building TLS and ASN.1 messages. |
| 31 | * | 29 | * |
| @@ -504,8 +502,6 @@ int cbs_get_any_asn1_element_internal(CBS *cbs, CBS *out, unsigned int *out_tag, | |||
| 504 | int CBS_asn1_indefinite_to_definite(CBS *in, uint8_t **out, size_t *out_len); | 502 | int CBS_asn1_indefinite_to_definite(CBS *in, uint8_t **out, size_t *out_len); |
| 505 | #endif /* LIBRESSL_INTERNAL */ | 503 | #endif /* LIBRESSL_INTERNAL */ |
| 506 | 504 | ||
| 507 | #if defined(__cplusplus) | 505 | __END_HIDDEN_DECLS |
| 508 | } /* extern C */ | ||
| 509 | #endif | ||
| 510 | 506 | ||
| 511 | #endif /* OPENSSL_HEADER_BYTESTRING_H */ | 507 | #endif /* OPENSSL_HEADER_BYTESTRING_H */ |
