early-access version 2698
This commit is contained in:
4
externals/libressl/crypto/comp/c_rle.c
vendored
4
externals/libressl/crypto/comp/c_rle.c
vendored
@@ -1,10 +1,12 @@
|
||||
/* $OpenBSD: c_rle.c,v 1.8 2014/11/03 16:58:28 tedu Exp $ */
|
||||
/* $OpenBSD: c_rle.c,v 1.9 2022/01/09 23:50:10 tb Exp $ */
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <openssl/objects.h>
|
||||
#include <openssl/comp.h>
|
||||
|
||||
#include "comp_local.h"
|
||||
|
||||
static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
|
||||
unsigned int olen, unsigned char *in, unsigned int ilen);
|
||||
static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
|
||||
|
8
externals/libressl/crypto/comp/c_zlib.c
vendored
8
externals/libressl/crypto/comp/c_zlib.c
vendored
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: c_zlib.c,v 1.20 2018/03/17 16:20:01 beck Exp $ */
|
||||
/* $OpenBSD: c_zlib.c,v 1.22 2022/01/14 08:40:57 tb Exp $ */
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -6,6 +6,8 @@
|
||||
#include <openssl/comp.h>
|
||||
#include <openssl/err.h>
|
||||
|
||||
#include "comp_local.h"
|
||||
|
||||
COMP_METHOD *COMP_zlib(void );
|
||||
|
||||
static COMP_METHOD zlib_method_nozlib = {
|
||||
@@ -232,7 +234,7 @@ static int bio_zlib_free(BIO *bi);
|
||||
static int bio_zlib_read(BIO *b, char *out, int outl);
|
||||
static int bio_zlib_write(BIO *b, const char *in, int inl);
|
||||
static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr);
|
||||
static long bio_zlib_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp);
|
||||
static long bio_zlib_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp);
|
||||
|
||||
static BIO_METHOD bio_meth_zlib = {
|
||||
.type = BIO_TYPE_COMP,
|
||||
@@ -553,7 +555,7 @@ bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr)
|
||||
|
||||
|
||||
static long
|
||||
bio_zlib_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
|
||||
bio_zlib_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
|
||||
{
|
||||
if (!b->next_bio)
|
||||
return 0;
|
||||
|
4
externals/libressl/crypto/comp/comp_err.c
vendored
4
externals/libressl/crypto/comp/comp_err.c
vendored
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: comp_err.c,v 1.10 2017/01/29 17:49:22 beck Exp $ */
|
||||
/* $OpenBSD: comp_err.c,v 1.11 2022/01/09 23:50:10 tb Exp $ */
|
||||
/* ====================================================================
|
||||
* Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
@@ -60,6 +60,8 @@
|
||||
#include <openssl/comp.h>
|
||||
#include <openssl/err.h>
|
||||
|
||||
#include "comp_local.h"
|
||||
|
||||
/* BEGIN ERROR CODES */
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
||||
|
4
externals/libressl/crypto/comp/comp_lib.c
vendored
4
externals/libressl/crypto/comp/comp_lib.c
vendored
@@ -1,10 +1,12 @@
|
||||
/* $OpenBSD: comp_lib.c,v 1.8 2014/11/03 16:58:28 tedu Exp $ */
|
||||
/* $OpenBSD: comp_lib.c,v 1.9 2022/01/09 23:50:10 tb Exp $ */
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <openssl/objects.h>
|
||||
#include <openssl/comp.h>
|
||||
|
||||
#include "comp_local.h"
|
||||
|
||||
COMP_CTX *
|
||||
COMP_CTX_new(COMP_METHOD *meth)
|
||||
{
|
||||
|
36
externals/libressl/crypto/comp/comp_local.h
vendored
Executable file
36
externals/libressl/crypto/comp/comp_local.h
vendored
Executable file
@@ -0,0 +1,36 @@
|
||||
/* $OpenBSD: comp_local.h,v 1.2 2022/01/14 08:21:12 tb Exp $ */
|
||||
|
||||
#ifndef HEADER_COMP_LOCAL_H
|
||||
#define HEADER_COMP_LOCAL_H
|
||||
|
||||
__BEGIN_HIDDEN_DECLS
|
||||
|
||||
struct CMP_CTX;
|
||||
|
||||
struct comp_method_st {
|
||||
int type; /* NID for compression library */
|
||||
const char *name; /* A text string to identify the library */
|
||||
int (*init)(COMP_CTX *ctx);
|
||||
void (*finish)(COMP_CTX *ctx);
|
||||
int (*compress)(COMP_CTX *ctx, unsigned char *out, unsigned int olen,
|
||||
unsigned char *in, unsigned int ilen);
|
||||
int (*expand)(COMP_CTX *ctx, unsigned char *out, unsigned int olen,
|
||||
unsigned char *in, unsigned int ilen);
|
||||
/* The following two do NOTHING, but are kept for backward compatibility */
|
||||
long (*ctrl)(void);
|
||||
long (*callback_ctrl)(void);
|
||||
} /* COMP_METHOD */;
|
||||
|
||||
struct comp_ctx_st {
|
||||
COMP_METHOD *meth;
|
||||
unsigned long compress_in;
|
||||
unsigned long compress_out;
|
||||
unsigned long expand_in;
|
||||
unsigned long expand_out;
|
||||
|
||||
CRYPTO_EX_DATA ex_data;
|
||||
} /* COMP_CTX */;
|
||||
|
||||
__END_HIDDEN_DECLS
|
||||
|
||||
#endif /* !HEADER_COMP_LOCAL_H */
|
Reference in New Issue
Block a user