Packman Build Service PMBS

makemkv.spec Changed

makemkv-oss-1.8.7.diff -> makemkv-oss-1.8.8.diff Changed

makemkv-bin-1.8.7.tar.gz/Makefile -> makemkv-bin-1.8.8.tar.gz/Makefile Changed

makemkv-bin-1.8.7.tar.gz/bin/amd64/makemkvcon -> makemkv-bin-1.8.8.tar.gz/bin/amd64/makemkvcon Changed

makemkv-bin-1.8.7.tar.gz/bin/i386/makemkvcon -> makemkv-bin-1.8.8.tar.gz/bin/i386/makemkvcon Changed

makemkv-bin-1.8.7.tar.gz/bin/i386/mmdtsdec -> makemkv-bin-1.8.8.tar.gz/bin/i386/mmdtsdec Changed

makemkv-bin-1.8.7.tar.gz/src/eula_en_linux.txt -> makemkv-bin-1.8.8.tar.gz/src/eula_en_linux.txt Changed

makemkv-bin-1.8.8.tar.gz/src/share/aac-stereo.mmcp.xml Added

@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<profile>
+    
+    <name lang="eng">AAC-stereo</name>
+
+    
+    <mkvSettings 
+        ignoreForcedSubtitlesFlag="true"
+        useISO639Type2T="false"
+        setFirstAudioTrackAsDefault="true"
+        setFirstSubtitleTrackAsDefault="true"
+        setFirstForcedSubtitleTrackAsDefault="true"
+        insertFirstChapter00IfMissing="true"
+    />
+
+    
+    <profileSettings
+        app_DefaultSelectionString="-sel:all,+sel:(favlang|nolang),+sel:lossless,-sel:(havemulti|havelossless),-sel:mvcvideo,=100:all,-10:favlang"
+    />
+
+    
+    <outputSettings name="copy" outputFormat="directCopy">
+        <description lang="eng">Copy track as is</description>
+        <description lang="ger">Track 1:1 kopieren</description>
+    </outputSettings>
+
+    <outputSettings name="aac" outputFormat="AAC">
+        <description lang="eng">Save as Mpeg-4 AAC-LC</description>
+        <extraArgs>codec=libfdk_aac profile=LC</extraArgs>
+        <extraArgs>afterburner=1</extraArgs>
+    </outputSettings>
+
+    <outputSettings name="he-aac" outputFormat="AAC">
+        <description lang="eng">Save as Mpeg-4 HE-AAC</description>
+        <extraArgs>codec=libfdk_aac profile=HE-AAC signaling=explicit_sbr</extraArgs>
+        <extraArgs>afterburner=1</extraArgs>
+    </outputSettings>
+
+    
+    <outputSettings name="he-aacv2" outputFormat="AAC">
+        <description lang="eng">Save as Mpeg-4 HE-AACv2</description>
+        <extraArgs>codec=libfdk_aac profile=HE-AACv2 signaling=explicit_hierarchical</extraArgs>
+        <extraArgs>afterburner=1</extraArgs>
+    </outputSettings>
+
+    <outputSettings name="aac-gpl" outputFormat="AAC">
+        <description lang="eng">Save as Mpeg-4 AAC-LC (ffmpeg encoder)</description>
+        <extraArgs>codec=aac -strict -2</extraArgs>
+        <extraArgs>aac_coder=twoloop</extraArgs>
+    </outputSettings>
+
+    
+    <audioMixSettings name="stereo16"
+        outputBPS="16"
+        outputChannelLayout="stereo"
+        mix="DolbyPrologic2">
+        <description lang="eng">Stereo 16-bit Dolby PrologicII downmix</description>
+    </audioMixSettings>
+
+    <audioMixSettings name="stereo16raw"
+        outputBPS="16"
+        outputChannelLayout="stereo"
+        centerMixLevel="-3dB"
+        surroundMixLevel="-6dB"
+        lfeMixLevel="0">
+        <description lang="eng">Stereo 16-bit downmix</description>
+    </audioMixSettings>
+
+    
+    <trackSettings input="default">
+        <output outputSettingsName="copy" 
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+
+    
+
+    <trackSettings input="LPCM-stereo">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+    <trackSettings input="LPCM-multi">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString"
+                audioMix="stereo16">
+        </output>
+    </trackSettings>
+
+    <trackSettings input="TRUEHD-stereo">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+    <trackSettings input="TRUEHD-multi">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString"
+                audioMix="stereo16">
+        </output>
+    </trackSettings>
+    <trackSettings input="MLP-stereo">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+    <trackSettings input="MLP-multi">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString"
+                audioMix="stereo16">
+        </output>
+    </trackSettings>
+
+    <trackSettings input="DTSHDMA-stereo">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+    <trackSettings input="DTSHDMA-multi">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString"
+                audioMix="stereo16">
+        </output>
+    </trackSettings>
+
+    
+    <trackSettings input="DTSHDLBR-stereo">
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+    <trackSettings input="DTSHDLBR-multi">
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString"
+                audioMix="stereo16">
+        </output>
+    </trackSettings>
+
+    <trackSettings input="DTS-stereo">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+    <trackSettings input="DTS-multi">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString"
+                audioMix="stereo16">
+        </output>
+    </trackSettings>
+
+    <trackSettings input="AC3-stereo">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+    <trackSettings input="AC3-multi">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString"
+                audioMix="stereo16">
+        </output>
+    </trackSettings>
+    <trackSettings input="EAC3-stereo">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+    <trackSettings input="EAC3-multi">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString"
+                audioMix="stereo16">
+        </output>
+    </trackSettings>
+
+    
+    <trackSettings input="AAC-stereo">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+    <trackSettings input="AAC-multi">
+        <output outputSettingsName="copy"
+                defaultSelection="$app_DefaultSelectionString,-sel:all">
+        </output>
+        <output outputSettingsName="aac"
+                defaultSelection="$app_DefaultSelectionString"
+                audioMix="stereo16">
+        </output>
+    </trackSettings>
+</profile>
+

makemkv-oss-1.8.7.tar.gz/libabi/inc/pssl Deleted

makemkv-oss-1.8.7.tar.gz/libabi/inc/pssl/ec.h Deleted

@@ -1,521 +0,0 @@
-/* crypto/ec/ec.h */
-/*
- * Originally written by Bodo Moeller for the OpenSSL project.
- */
-/* ====================================================================
- * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by 
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by 
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-#ifndef HEADER_EC_H
-#define HEADER_EC_H
-
-#include <openssl/opensslconf.h>
-
-#include <openssl/asn1.h>
-#include <openssl/symhacks.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#elif defined(__SUNPRO_C)
-# if __SUNPRO_C >= 0x520
-# pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
-# endif
-#endif
-
-
-#ifndef OPENSSL_ECC_MAX_FIELD_BITS
-# define OPENSSL_ECC_MAX_FIELD_BITS 661
-#endif
-
-typedef enum {
-	/* values as defined in X9.62 (ECDSA) and elsewhere */
-	POINT_CONVERSION_COMPRESSED = 2,
-	POINT_CONVERSION_UNCOMPRESSED = 4,
-	POINT_CONVERSION_HYBRID = 6
-} point_conversion_form_t;
-
-
-typedef struct ec_method_st EC_METHOD;
-
-typedef struct ec_group_st
-	/*
-	 EC_METHOD *meth;
-	 -- field definition
-	 -- curve coefficients
-	 -- optional generator with associated information (order, cofactor)
-	 -- optional extra data (precomputed table for fast computation of multiples of generator)
-	 -- ASN1 stuff
-	*/
-	EC_GROUP;
-
-typedef struct ec_point_st EC_POINT;
-
-
-/* EC_METHODs for curves over GF(p).
- * EC_GFp_simple_method provides the basis for the optimized methods.
- */
-const EC_METHOD *EC_GFp_simple_method(void);
-const EC_METHOD *EC_GFp_mont_method(void);
-const EC_METHOD *EC_GFp_nist_method(void);
-
-/* EC_METHOD for curves over GF(2^m).
- */
-const EC_METHOD *EC_GF2m_simple_method(void);
-
-
-EC_GROUP *EC_GROUP_new(const EC_METHOD *);
-void EC_GROUP_free(EC_GROUP *);
-void EC_GROUP_clear_free(EC_GROUP *);
-int EC_GROUP_copy(EC_GROUP *, const EC_GROUP *);
-EC_GROUP *EC_GROUP_dup(const EC_GROUP *);
-
-const EC_METHOD *EC_GROUP_method_of(const EC_GROUP *);
-int EC_METHOD_get_field_type(const EC_METHOD *);
-
-int EC_GROUP_set_generator(EC_GROUP *, const EC_POINT *generator, const BIGNUM *order, const BIGNUM *cofactor);
-const EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *);
-int EC_GROUP_get_order(const EC_GROUP *, BIGNUM *order, BN_CTX *);
-int EC_GROUP_get_cofactor(const EC_GROUP *, BIGNUM *cofactor, BN_CTX *);
-
-void EC_GROUP_set_curve_name(EC_GROUP *, int nid);
-int EC_GROUP_get_curve_name(const EC_GROUP *);
-
-void EC_GROUP_set_asn1_flag(EC_GROUP *, int flag);
-int EC_GROUP_get_asn1_flag(const EC_GROUP *);
-
-void EC_GROUP_set_point_conversion_form(EC_GROUP *, point_conversion_form_t);
-point_conversion_form_t EC_GROUP_get_point_conversion_form(const EC_GROUP *);
-
-unsigned char *EC_GROUP_get0_seed(const EC_GROUP *);
-size_t EC_GROUP_get_seed_len(const EC_GROUP *);
-size_t EC_GROUP_set_seed(EC_GROUP *, const unsigned char *, size_t len);
-
-int EC_GROUP_set_curve_GFp(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-int EC_GROUP_get_curve_GFp(const EC_GROUP *, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *);
-int EC_GROUP_set_curve_GF2m(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-int EC_GROUP_get_curve_GF2m(const EC_GROUP *, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *);
-
-/* returns the number of bits needed to represent a field element */
-int EC_GROUP_get_degree(const EC_GROUP *);
-
-/* EC_GROUP_check() returns 1 if 'group' defines a valid group, 0 otherwise */
-int EC_GROUP_check(const EC_GROUP *group, BN_CTX *ctx);
-/* EC_GROUP_check_discriminant() returns 1 if the discriminant of the
- * elliptic curve is not zero, 0 otherwise */
-int EC_GROUP_check_discriminant(const EC_GROUP *, BN_CTX *);
-
-/* EC_GROUP_cmp() returns 0 if both groups are equal and 1 otherwise */
-int EC_GROUP_cmp(const EC_GROUP *, const EC_GROUP *, BN_CTX *);
-
-/* EC_GROUP_new_GF*() calls EC_GROUP_new() and EC_GROUP_set_GF*()
- * after choosing an appropriate EC_METHOD */
-EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-
-/* EC_GROUP_new_by_curve_name() creates a EC_GROUP structure
- * specified by a curve name (in form of a NID) */
-EC_GROUP *EC_GROUP_new_by_curve_name(int nid);
-/* handling of internal curves */
-typedef struct { 
-	int nid;
-	const char *comment;
-	} EC_builtin_curve;
-/* EC_builtin_curves(EC_builtin_curve *r, size_t size) returns number 
- * of all available curves or zero if a error occurred. 
- * In case r ist not zero nitems EC_builtin_curve structures 
- * are filled with the data of the first nitems internal groups */
-size_t EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
-
-
-/* EC_POINT functions */
-
-EC_POINT *EC_POINT_new(const EC_GROUP *);
-void EC_POINT_free(EC_POINT *);
-void EC_POINT_clear_free(EC_POINT *);
-int EC_POINT_copy(EC_POINT *, const EC_POINT *);
-EC_POINT *EC_POINT_dup(const EC_POINT *, const EC_GROUP *);
- 
-const EC_METHOD *EC_POINT_method_of(const EC_POINT *);
-
-int EC_POINT_set_to_infinity(const EC_GROUP *, EC_POINT *);
-int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *);
-int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *, const EC_POINT *,
-	BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *);
-int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, const BIGNUM *y, BN_CTX *);
-int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *, const EC_POINT *,
-	BIGNUM *x, BIGNUM *y, BN_CTX *);
-int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, int y_bit, BN_CTX *);
-
-int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, const BIGNUM *y, BN_CTX *);
-int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *, const EC_POINT *,
-	BIGNUM *x, BIGNUM *y, BN_CTX *);
-int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, int y_bit, BN_CTX *);
-
-size_t EC_POINT_point2oct(const EC_GROUP *, const EC_POINT *, point_conversion_form_t form,
-        unsigned char *buf, size_t len, BN_CTX *);
-int EC_POINT_oct2point(const EC_GROUP *, EC_POINT *,
-        const unsigned char *buf, size_t len, BN_CTX *);
-
-/* other interfaces to point2oct/oct2point: */
-BIGNUM *EC_POINT_point2bn(const EC_GROUP *, const EC_POINT *,
-	point_conversion_form_t form, BIGNUM *, BN_CTX *);
-EC_POINT *EC_POINT_bn2point(const EC_GROUP *, const BIGNUM *,
-	EC_POINT *, BN_CTX *);
-char *EC_POINT_point2hex(const EC_GROUP *, const EC_POINT *,
-	point_conversion_form_t form, BN_CTX *);
-EC_POINT *EC_POINT_hex2point(const EC_GROUP *, const char *,
-	EC_POINT *, BN_CTX *);
-
-int EC_POINT_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *);
-int EC_POINT_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *);
-int EC_POINT_invert(const EC_GROUP *, EC_POINT *, BN_CTX *);
-
-int EC_POINT_is_at_infinity(const EC_GROUP *, const EC_POINT *);
-int EC_POINT_is_on_curve(const EC_GROUP *, const EC_POINT *, BN_CTX *);
-int EC_POINT_cmp(const EC_GROUP *, const EC_POINT *a, const EC_POINT *b, BN_CTX *);
-
-int EC_POINT_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *);
-int EC_POINTs_make_affine(const EC_GROUP *, size_t num, EC_POINT *[], BN_CTX *);
-
-
-int EC_POINTs_mul(const EC_GROUP *, EC_POINT *r, const BIGNUM *, size_t num, const EC_POINT *[], const BIGNUM *[], BN_CTX *);
-int EC_POINT_mul(const EC_GROUP *, EC_POINT *r, const BIGNUM *, const EC_POINT *, const BIGNUM *, BN_CTX *);
-
-/* EC_GROUP_precompute_mult() stores multiples of generator for faster point multiplication */
-int EC_GROUP_precompute_mult(EC_GROUP *, BN_CTX *);
-/* EC_GROUP_have_precompute_mult() reports whether such precomputation has been done */
-int EC_GROUP_have_precompute_mult(const EC_GROUP *);
-
-
-
-/* ASN1 stuff */
-
-/* EC_GROUP_get_basis_type() returns the NID of the basis type
- * used to represent the field elements */
-int EC_GROUP_get_basis_type(const EC_GROUP *);
-int EC_GROUP_get_trinomial_basis(const EC_GROUP *, unsigned int *k);
-int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1, 
-	unsigned int *k2, unsigned int *k3);
-
-#define OPENSSL_EC_NAMED_CURVE	0x001
-
-typedef struct ecpk_parameters_st ECPKPARAMETERS;
-
-EC_GROUP *d2i_ECPKParameters(EC_GROUP **, const unsigned char **in, long len);
-int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
-
-#define d2i_ECPKParameters_bio(bp,x) ASN1_d2i_bio_of(EC_GROUP,NULL,d2i_ECPKParameters,bp,x)
-#define i2d_ECPKParameters_bio(bp,x) ASN1_i2d_bio_of_const(EC_GROUP,i2d_ECPKParameters,bp,x)
-#define d2i_ECPKParameters_fp(fp,x) (EC_GROUP *)ASN1_d2i_fp(NULL, \
-                (char *(*)())d2i_ECPKParameters,(fp),(unsigned char **)(x))
-#define i2d_ECPKParameters_fp(fp,x) ASN1_i2d_fp(i2d_ECPKParameters,(fp), \
-		(unsigned char *)(x))
-
-#ifndef OPENSSL_NO_BIO
-int     ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
-#endif
-#ifndef OPENSSL_NO_FP_API
-int     ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
-#endif
-
-/* the EC_KEY stuff */
-typedef struct ec_key_st EC_KEY;
-
-/* some values for the encoding_flag */
-#define EC_PKEY_NO_PARAMETERS	0x001
-#define EC_PKEY_NO_PUBKEY	0x002
-
-EC_KEY *EC_KEY_new(void);
-EC_KEY *EC_KEY_new_by_curve_name(int nid);
-void EC_KEY_free(EC_KEY *);
-EC_KEY *EC_KEY_copy(EC_KEY *, const EC_KEY *);
-EC_KEY *EC_KEY_dup(const EC_KEY *);
-
-int EC_KEY_up_ref(EC_KEY *);
-
-const EC_GROUP *EC_KEY_get0_group(const EC_KEY *);
-int EC_KEY_set_group(EC_KEY *, const EC_GROUP *);
-const BIGNUM *EC_KEY_get0_private_key(const EC_KEY *);
-int EC_KEY_set_private_key(EC_KEY *, const BIGNUM *);
-const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *);
-int EC_KEY_set_public_key(EC_KEY *, const EC_POINT *);
-unsigned EC_KEY_get_enc_flags(const EC_KEY *);
-void EC_KEY_set_enc_flags(EC_KEY *, unsigned int);
-point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *);
-void EC_KEY_set_conv_form(EC_KEY *, point_conversion_form_t);
-/* functions to set/get method specific data  */
-void *EC_KEY_get_key_method_data(EC_KEY *, 
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
-void EC_KEY_insert_key_method_data(EC_KEY *, void *data,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
-/* wrapper functions for the underlying EC_GROUP object */
-void EC_KEY_set_asn1_flag(EC_KEY *, int);
-int EC_KEY_precompute_mult(EC_KEY *, BN_CTX *ctx);
-
-/* EC_KEY_generate_key() creates a ec private (public) key */
-int EC_KEY_generate_key(EC_KEY *);
-/* EC_KEY_check_key() */
-int EC_KEY_check_key(const EC_KEY *);
-
-/* de- and encoding functions for SEC1 ECPrivateKey */
-EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len);
-int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out);
-/* de- and encoding functions for EC parameters */
-EC_KEY *d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len);
-int i2d_ECParameters(EC_KEY *a, unsigned char **out);
-/* de- and encoding functions for EC public key
- * (octet string, not DER -- hence 'o2i' and 'i2o') */
-EC_KEY *o2i_ECPublicKey(EC_KEY **a, const unsigned char **in, long len);
-int i2o_ECPublicKey(EC_KEY *a, unsigned char **out);
-
-#ifndef OPENSSL_NO_BIO
-int	ECParameters_print(BIO *bp, const EC_KEY *x);
-int	EC_KEY_print(BIO *bp, const EC_KEY *x, int off);
-#endif
-#ifndef OPENSSL_NO_FP_API
-int	ECParameters_print_fp(FILE *fp, const EC_KEY *x);
-int	EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off);
-#endif
-
-#define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
-
-#ifndef __cplusplus
-#if defined(__SUNPRO_C)
-#  if __SUNPRO_C >= 0x520
-# pragma error_messages (default,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
-#  endif
-# endif
-#endif
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_EC_strings(void);
-
-/* Error codes for the EC functions. */
-
-/* Function codes. */
-#define EC_F_COMPUTE_WNAF				 143
-#define EC_F_D2I_ECPARAMETERS				 144
-#define EC_F_D2I_ECPKPARAMETERS				 145
-#define EC_F_D2I_ECPRIVATEKEY				 146
-#define EC_F_ECPARAMETERS_PRINT				 147
-#define EC_F_ECPARAMETERS_PRINT_FP			 148
-#define EC_F_ECPKPARAMETERS_PRINT			 149
-#define EC_F_ECPKPARAMETERS_PRINT_FP			 150
-#define EC_F_ECP_NIST_MOD_192				 203
-#define EC_F_ECP_NIST_MOD_224				 204
-#define EC_F_ECP_NIST_MOD_256				 205
-#define EC_F_ECP_NIST_MOD_521				 206
-#define EC_F_EC_ASN1_GROUP2CURVE			 153
-#define EC_F_EC_ASN1_GROUP2FIELDID			 154
-#define EC_F_EC_ASN1_GROUP2PARAMETERS			 155
-#define EC_F_EC_ASN1_GROUP2PKPARAMETERS			 156
-#define EC_F_EC_ASN1_PARAMETERS2GROUP			 157
-#define EC_F_EC_ASN1_PKPARAMETERS2GROUP			 158
-#define EC_F_EC_EX_DATA_SET_DATA			 211
-#define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY		 208
-#define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT	 159
-#define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE		 195
-#define EC_F_EC_GF2M_SIMPLE_OCT2POINT			 160
-#define EC_F_EC_GF2M_SIMPLE_POINT2OCT			 161
-#define EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES 162
-#define EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES 163
-#define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES	 164
-#define EC_F_EC_GFP_MONT_FIELD_DECODE			 133
-#define EC_F_EC_GFP_MONT_FIELD_ENCODE			 134
-#define EC_F_EC_GFP_MONT_FIELD_MUL			 131
-#define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE		 209
-#define EC_F_EC_GFP_MONT_FIELD_SQR			 132
-#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE		 189
-#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP		 135
-#define EC_F_EC_GFP_NIST_FIELD_MUL			 200
-#define EC_F_EC_GFP_NIST_FIELD_SQR			 201
-#define EC_F_EC_GFP_NIST_GROUP_SET_CURVE		 202
-#define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT	 165
-#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE		 166
-#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP		 100
-#define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR		 101
-#define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE			 102
-#define EC_F_EC_GFP_SIMPLE_OCT2POINT			 103
-#define EC_F_EC_GFP_SIMPLE_POINT2OCT			 104
-#define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE		 137
-#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES	 167
-#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP 105
-#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES	 168
-#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP 128
-#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES	 169
-#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP 129
-#define EC_F_EC_GROUP_CHECK				 170
-#define EC_F_EC_GROUP_CHECK_DISCRIMINANT		 171
-#define EC_F_EC_GROUP_COPY				 106
-#define EC_F_EC_GROUP_GET0_GENERATOR			 139
-#define EC_F_EC_GROUP_GET_COFACTOR			 140
-#define EC_F_EC_GROUP_GET_CURVE_GF2M			 172
-#define EC_F_EC_GROUP_GET_CURVE_GFP			 130
-#define EC_F_EC_GROUP_GET_DEGREE			 173
-#define EC_F_EC_GROUP_GET_ORDER				 141
-#define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS		 193
-#define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS		 194
-#define EC_F_EC_GROUP_NEW				 108
-#define EC_F_EC_GROUP_NEW_BY_CURVE_NAME			 174
-#define EC_F_EC_GROUP_NEW_FROM_DATA			 175
-#define EC_F_EC_GROUP_PRECOMPUTE_MULT			 142
-#define EC_F_EC_GROUP_SET_CURVE_GF2M			 176
-#define EC_F_EC_GROUP_SET_CURVE_GFP			 109
-#define EC_F_EC_GROUP_SET_EXTRA_DATA			 110
-#define EC_F_EC_GROUP_SET_GENERATOR			 111
-#define EC_F_EC_KEY_CHECK_KEY				 177
-#define EC_F_EC_KEY_COPY				 178
-#define EC_F_EC_KEY_GENERATE_KEY			 179
-#define EC_F_EC_KEY_NEW					 182
-#define EC_F_EC_KEY_PRINT				 180
-#define EC_F_EC_KEY_PRINT_FP				 181
-#define EC_F_EC_POINTS_MAKE_AFFINE			 136
-#define EC_F_EC_POINTS_MUL				 138
-#define EC_F_EC_POINT_ADD				 112
-#define EC_F_EC_POINT_CMP				 113
-#define EC_F_EC_POINT_COPY				 114
-#define EC_F_EC_POINT_DBL				 115
-#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M	 183
-#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP	 116
-#define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP	 117
-#define EC_F_EC_POINT_INVERT				 210
-#define EC_F_EC_POINT_IS_AT_INFINITY			 118
-#define EC_F_EC_POINT_IS_ON_CURVE			 119
-#define EC_F_EC_POINT_MAKE_AFFINE			 120
-#define EC_F_EC_POINT_MUL				 184
-#define EC_F_EC_POINT_NEW				 121
-#define EC_F_EC_POINT_OCT2POINT				 122
-#define EC_F_EC_POINT_POINT2OCT				 123
-#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M	 185
-#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP	 124
-#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M	 186
-#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP	 125
-#define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP	 126
-#define EC_F_EC_POINT_SET_TO_INFINITY			 127
-#define EC_F_EC_PRE_COMP_DUP				 207
-#define EC_F_EC_WNAF_MUL				 187
-#define EC_F_EC_WNAF_PRECOMPUTE_MULT			 188
-#define EC_F_I2D_ECPARAMETERS				 190
-#define EC_F_I2D_ECPKPARAMETERS				 191
-#define EC_F_I2D_ECPRIVATEKEY				 192
-#define EC_F_I2O_ECPUBLICKEY				 151
-#define EC_F_O2I_ECPUBLICKEY				 152
-
-/* Reason codes. */
-#define EC_R_ASN1_ERROR					 115
-#define EC_R_ASN1_UNKNOWN_FIELD				 116
-#define EC_R_BUFFER_TOO_SMALL				 100
-#define EC_R_D2I_ECPKPARAMETERS_FAILURE			 117
-#define EC_R_DISCRIMINANT_IS_ZERO			 118
-#define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE		 119
-#define EC_R_FIELD_TOO_LARGE				 138
-#define EC_R_GROUP2PKPARAMETERS_FAILURE			 120
-#define EC_R_I2D_ECPKPARAMETERS_FAILURE			 121
-#define EC_R_INCOMPATIBLE_OBJECTS			 101
-#define EC_R_INVALID_ARGUMENT				 112
-#define EC_R_INVALID_COMPRESSED_POINT			 110
-#define EC_R_INVALID_COMPRESSION_BIT			 109
-#define EC_R_INVALID_ENCODING				 102
-#define EC_R_INVALID_FIELD				 103
-#define EC_R_INVALID_FORM				 104
-#define EC_R_INVALID_GROUP_ORDER			 122
-#define EC_R_INVALID_PENTANOMIAL_BASIS			 132
-#define EC_R_INVALID_PRIVATE_KEY			 123
-#define EC_R_INVALID_TRINOMIAL_BASIS			 137
-#define EC_R_MISSING_PARAMETERS				 124
-#define EC_R_MISSING_PRIVATE_KEY			 125
-#define EC_R_NOT_A_NIST_PRIME				 135
-#define EC_R_NOT_A_SUPPORTED_NIST_PRIME			 136
-#define EC_R_NOT_IMPLEMENTED				 126
-#define EC_R_NOT_INITIALIZED				 111
-#define EC_R_NO_FIELD_MOD				 133
-#define EC_R_PASSED_NULL_PARAMETER			 134
-#define EC_R_PKPARAMETERS2GROUP_FAILURE			 127
-#define EC_R_POINT_AT_INFINITY				 106
-#define EC_R_POINT_IS_NOT_ON_CURVE			 107
-#define EC_R_SLOT_FULL					 108
-#define EC_R_UNDEFINED_GENERATOR			 113
-#define EC_R_UNDEFINED_ORDER				 128
-#define EC_R_UNKNOWN_GROUP				 129
-#define EC_R_UNKNOWN_ORDER				 114
-#define EC_R_UNSUPPORTED_FIELD				 131
-#define EC_R_WRONG_ORDER				 130
-
-#ifdef  __cplusplus
-}
-#endif
-#endif

makemkv-oss-1.8.7.tar.gz/libabi/inc/pssl/ecdsa.h Deleted

@@ -1,267 +0,0 @@
-/* crypto/ecdsa/ecdsa.h */
-/**
- * \file   crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions
- * \author Written by Nils Larsch for the OpenSSL project
- */
-/* ====================================================================
- * Copyright (c) 2000-2003 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_ECDSA_H
-#define HEADER_ECDSA_H
-
-#include <openssl/opensslconf.h>
-
-#include <pssl/ec.h>
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct ECDSA_SIG_st
-	{
-	BIGNUM *r;
-	BIGNUM *s;
-	} ECDSA_SIG;
-
-/** ECDSA_SIG *ECDSA_SIG_new(void)
- * allocates and initialize a ECDSA_SIG structure
- * \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_SIG_new(void);
-
-/** ECDSA_SIG_free
- * frees a ECDSA_SIG structure
- * \param a pointer to the ECDSA_SIG structure
- */
-void	  ECDSA_SIG_free(ECDSA_SIG *a);
-
-/** i2d_ECDSA_SIG
- * DER encode content of ECDSA_SIG object (note: this function modifies *pp
- * (*pp += length of the DER encoded signature)).
- * \param a  pointer to the ECDSA_SIG object
- * \param pp pointer to a unsigned char pointer for the output or NULL
- * \return the length of the DER encoded ECDSA_SIG object or 0 
- */
-int	  i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **pp);
-
-/** d2i_ECDSA_SIG
- * decodes a DER encoded ECDSA signature (note: this function changes *pp
- * (*pp += len)). 
- * \param v pointer to ECDSA_SIG pointer (may be NULL)
- * \param pp buffer with the DER encoded signature
- * \param len bufferlength
- * \return pointer to the decoded ECDSA_SIG structure (or NULL)
- */
-ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **v, const unsigned char **pp, long len);
-
-/** ECDSA_do_sign
- * computes the ECDSA signature of the given hash value using
- * the supplied private key and returns the created signature.
- * \param dgst pointer to the hash value
- * \param dgst_len length of the hash value
- * \param eckey pointer to the EC_KEY object containing a private EC key
- * \return pointer to a ECDSA_SIG structure or NULL
- */
-ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst,int dgst_len,EC_KEY *eckey);
-
-/** ECDSA_do_sign_ex
- * computes ECDSA signature of a given hash value using the supplied
- * private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- * \param dgst pointer to the hash value to sign
- * \param dgstlen length of the hash value
- * \param kinv optional pointer to a pre-computed inverse k
- * \param rp optional pointer to the pre-computed rp value (see 
- *        ECDSA_sign_setup
- * \param eckey pointer to the EC_KEY object containing a private EC key
- * \return pointer to a ECDSA_SIG structure or NULL
- */
-ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen, 
-		const BIGNUM *kinv, const BIGNUM *rp, EC_KEY *eckey);
-
-/** ECDSA_do_verify
- * verifies that the supplied signature is a valid ECDSA
- * signature of the supplied hash value using the supplied public key.
- * \param dgst pointer to the hash value
- * \param dgst_len length of the hash value
- * \param sig  pointer to the ECDSA_SIG structure
- * \param eckey pointer to the EC_KEY object containing a public EC key
- * \return 1 if the signature is valid, 0 if the signature is invalid and -1 on error
- */
-int	  ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
-		const ECDSA_SIG *sig, EC_KEY* eckey);
-
-const ECDSA_METHOD *ECDSA_PrivateSSL(void);
-
-/** ECDSA_set_default_method
- * sets the default ECDSA method
- * \param meth the new default ECDSA_METHOD
- */
-void	  ECDSA_set_default_method(const ECDSA_METHOD *meth);
-
-/** ECDSA_get_default_method
- * returns the default ECDSA method
- * \return pointer to ECDSA_METHOD structure containing the default method
- */
-const ECDSA_METHOD *ECDSA_get_default_method(void);
-
-/** ECDSA_set_method
- * sets method to be used for the ECDSA operations
- * \param eckey pointer to the EC_KEY object
- * \param meth  pointer to the new method
- * \return 1 on success and 0 otherwise 
- */
-int 	  ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth);
-
-/** ECDSA_size
- * returns the maximum length of the DER encoded signature
- * \param  eckey pointer to a EC_KEY object
- * \return numbers of bytes required for the DER encoded signature
- */
-int	  ECDSA_size(const EC_KEY *eckey);
-
-/** ECDSA_sign_setup
- * precompute parts of the signing operation. 
- * \param eckey pointer to the EC_KEY object containing a private EC key
- * \param ctx  pointer to a BN_CTX object (may be NULL)
- * \param kinv pointer to a BIGNUM pointer for the inverse of k
- * \param rp   pointer to a BIGNUM pointer for x coordinate of k * generator
- * \return 1 on success and 0 otherwise
- */
-int 	  ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinv, 
-		BIGNUM **rp);
-
-/** ECDSA_sign
- * computes ECDSA signature of a given hash value using the supplied
- * private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- * \param type this parameter is ignored
- * \param dgst pointer to the hash value to sign
- * \param dgstlen length of the hash value
- * \param sig buffer to hold the DER encoded signature
- * \param siglen pointer to the length of the returned signature
- * \param eckey pointer to the EC_KEY object containing a private EC key
- * \return 1 on success and 0 otherwise
- */
-int	  ECDSA_sign(int type, const unsigned char *dgst, int dgstlen, 
-		unsigned char *sig, unsigned int *siglen, EC_KEY *eckey);
-
-
-/** ECDSA_sign_ex
- * computes ECDSA signature of a given hash value using the supplied
- * private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- * \param type this parameter is ignored
- * \param dgst pointer to the hash value to sign
- * \param dgstlen length of the hash value
- * \param sig buffer to hold the DER encoded signature
- * \param siglen pointer to the length of the returned signature
- * \param kinv optional pointer to a pre-computed inverse k
- * \param rp optional pointer to the pre-computed rp value (see 
- *        ECDSA_sign_setup
- * \param eckey pointer to the EC_KEY object containing a private EC key
- * \return 1 on success and 0 otherwise
- */
-int	  ECDSA_sign_ex(int type, const unsigned char *dgst, int dgstlen, 
-		unsigned char *sig, unsigned int *siglen, const BIGNUM *kinv,
-		const BIGNUM *rp, EC_KEY *eckey);
-
-/** ECDSA_verify
- * verifies that the given signature is valid ECDSA signature
- * of the supplied hash value using the specified public key.
- * \param type this parameter is ignored
- * \param dgst pointer to the hash value 
- * \param dgstlen length of the hash value
- * \param sig  pointer to the DER encoded signature
- * \param siglen length of the DER encoded signature
- * \param eckey pointer to the EC_KEY object containing a public EC key
- * \return 1 if the signature is valid, 0 if the signature is invalid and -1 on error
- */
-int 	  ECDSA_verify(int type, const unsigned char *dgst, int dgstlen, 
-		const unsigned char *sig, int siglen, EC_KEY *eckey);
-
-/* the standard ex_data functions */
-int 	  ECDSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new 
-		*new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int 	  ECDSA_set_ex_data(EC_KEY *d, int idx, void *arg);
-void 	  *ECDSA_get_ex_data(EC_KEY *d, int idx);
-
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ECDSA_strings(void);
-
-/* Error codes for the ECDSA functions. */
-
-/* Function codes. */
-#define ECDSA_F_ECDSA_DATA_NEW_METHOD			 100
-#define ECDSA_F_ECDSA_DO_SIGN				 101
-#define ECDSA_F_ECDSA_DO_VERIFY				 102
-#define ECDSA_F_ECDSA_SIGN_SETUP			 103
-
-/* Reason codes. */
-#define ECDSA_R_BAD_SIGNATURE				 100
-#define ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE		 101
-#define ECDSA_R_ERR_EC_LIB				 102
-#define ECDSA_R_MISSING_PARAMETERS			 103
-#define ECDSA_R_NEED_NEW_SETUP_VALUES			 106
-#define ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED		 104
-#define ECDSA_R_SIGNATURE_MALLOC_FAILED			 105
-
-#ifdef  __cplusplus
-}
-#endif
-#endif

makemkv-oss-1.8.7.tar.gz/libabi/pssl/ec_cvt.c Deleted

@@ -1,98 +0,0 @@
-/* crypto/ec/ec_cvt.c */
-/*
- * Originally written by Bodo Moeller for the OpenSSL project.
- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by 
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-#include <openssl/err.h>
-#include "ec_lcl.h"
-
-#ifndef SKIP_PRIVATE_OSSL
-
-EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-	{
-	const EC_METHOD *meth;
-	EC_GROUP *ret;
-
-		meth = EC_GFp_mont_method();
-
-		ret = EC_GROUP_new(meth);
-		if (ret == NULL)
-			return NULL;
-
-		if (!EC_GROUP_set_curve_GFp(ret, p, a, b, ctx))
-			{
-			EC_GROUP_clear_free(ret);
-			return NULL;
-			}
-
-	return ret;
-	}
-
-
-#endif

makemkv-oss-1.8.7.tar.gz/libabi/pssl/ecs_locl.h Deleted

@@ -1,116 +0,0 @@
-/* crypto/ecdsa/ecs_locl.h */
-/*
- * Written by Nils Larsch for the OpenSSL project
- */
-/* ====================================================================
- * Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_ECS_LOCL_H
-#define HEADER_ECS_LOCL_H
-
-#include <openssl/opensslconf.h>
-#if defined(OPENSSL_NO_EC) || defined(PRIVATE_OSSL)
-
-#include <pssl/ecdsa.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-struct ecdsa_method 
-	{
-	const char *name;
-	ECDSA_SIG *(*ecdsa_do_sign)(const unsigned char *dgst, int dgst_len, 
-			const BIGNUM *inv, const BIGNUM *rp, EC_KEY *eckey);
-	int (*ecdsa_sign_setup)(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinv, 
-			BIGNUM **r);
-	int (*ecdsa_do_verify)(const unsigned char *dgst, int dgst_len, 
-			const ECDSA_SIG *sig, EC_KEY *eckey);
-#if 0
-	int (*init)(EC_KEY *eckey);
-	int (*finish)(EC_KEY *eckey);
-#endif
-	int flags;
-	char *app_data;
-	};
-
-typedef struct ecdsa_data_st {
-	/* EC_KEY_METH_DATA part */
-	int (*init)(EC_KEY *);
-	/* method (ECDSA) specific part */
-	ENGINE	*engine;
-	int	flags;
-	const ECDSA_METHOD *meth;
-	CRYPTO_EX_DATA ex_data;
-} ECDSA_DATA;
-
-/** ecdsa_check
- * checks whether ECKEY->meth_data is a pointer to a ECDSA_DATA structure
- * and if not it removes the old meth_data and creates a ECDSA_DATA structure.
- * \param  eckey pointer to a EC_KEY object
- * \return pointer to a ECDSA_DATA structure
- */
-ECDSA_DATA *ecdsa_check(EC_KEY *eckey);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#else
-
-#define SKIP_PRIVATE_OSSL
-
-#endif
-
-#endif /* HEADER_ECS_LOCL_H */

makemkv-oss-1.8.7.tar.gz/License.txt -> makemkv-oss-1.8.8.tar.gz/License.txt Changed

makemkv-oss-1.8.7.tar.gz/configure -> makemkv-oss-1.8.8.tar.gz/configure Changed

@@ -681,6 +681,7 @@
 ac_user_opts='
 enable_option_checking
 enable_gui
+enable_noec
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1317,6 +1318,8 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-gui           do not build GUI (default is build GUI)
+  --enable-noec           use private ECDSA code (default - use openssl ECDSA
+                          if available)
 
 Some influential environment variables:
   DESTDIR     Installation root for maintainer mode
@@ -2635,6 +2638,7 @@
 ac_config_headers="$ac_config_headers libffabi/src/ffabicfg.h"
 
 
+
 # Check whether --enable-gui was given.
 if test "${enable_gui+set}" = set; then :
   enableval=$enable_gui;
@@ -2645,6 +2649,14 @@
 ENABLE_GUI=$enable_gui
 
 
+# Check whether --enable-noec was given.
+if test "${enable_noec+set}" = set; then :
+  enableval=$enable_noec;
+else
+  enable_noec=no
+fi
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3958,6 +3970,10 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
+if test "$enable_noec" != "no"; then
+  CFLAGS_OPT="$CFLAGS_OPT -DFORCE_OPENSSL_NO_EC=1";
+fi
+
 # zlib
 
 ac_ext=c
@@ -4365,6 +4381,13 @@
 #define HAVE_ZLIB_H 1
 _ACEOF
 
+else
+
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "zlib library header files not found
+See \`config.log' for more details" "$LINENO" 5; }
+
 fi
 
 done
@@ -4412,6 +4435,13 @@
 
   LIBS="-lz $LIBS"
 
+else
+
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "zlib library not found
+See \`config.log' for more details" "$LINENO" 5; }
+
 fi
 
 
@@ -4424,6 +4454,13 @@
 #define HAVE_OPENSSL_OPENSSLCONF_H 1
 _ACEOF
 
+else
+
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "openssl library header files not found
+See \`config.log' for more details" "$LINENO" 5; }
+
 fi
 
 done
@@ -4471,6 +4508,13 @@
 
   LIBS="-lcrypto $LIBS"
 
+else
+
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "openssl library not found
+See \`config.log' for more details" "$LINENO" 5; }
+
 fi
 
 
@@ -4483,6 +4527,13 @@
 #define HAVE_EXPAT_H 1
 _ACEOF
 
+else
+
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "expat library header files not found
+See \`config.log' for more details" "$LINENO" 5; }
+
 fi
 
 done
@@ -4530,6 +4581,13 @@
 
   LIBS="-lexpat $LIBS"
 
+else
+
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "expat library not found
+See \`config.log' for more details" "$LINENO" 5; }
+
 fi
 
 
@@ -4926,6 +4984,17 @@
 
 
 fi
+
+
+ac_fn_c_check_decl "$LINENO" "AV_CH_TOP_BACK_CENTER" "ac_cv_have_decl_AV_CH_TOP_BACK_CENTER" "#include <libavutil/channel_layout.h>
+"
+if test "x$ac_cv_have_decl_AV_CH_TOP_BACK_CENTER" = xyes; then :
+
+
+$as_echo "#define FFABI_HAVE_AVUTIL_CHANNEL_LAYOUT_H 1" >>confdefs.h
+
+
+fi
 
 
 ac_config_files="$ac_config_files Makefile"

makemkv-oss-1.8.7.tar.gz/libabi/inc/lgpl/expatabi.h -> makemkv-oss-1.8.8.tar.gz/libabi/inc/lgpl/expatabi.h Changed

makemkv-oss-1.8.7.tar.gz/libabi/inc/lgpl/httpabi.h -> makemkv-oss-1.8.8.tar.gz/libabi/inc/lgpl/httpabi.h Changed

makemkv-oss-1.8.7.tar.gz/libabi/inc/lgpl/osslabi.h -> makemkv-oss-1.8.8.tar.gz/libabi/inc/lgpl/osslabi.h Changed

makemkv-oss-1.8.7.tar.gz/libabi/inc/lgpl/sysabi.h -> makemkv-oss-1.8.8.tar.gz/libabi/inc/lgpl/sysabi.h Changed

makemkv-oss-1.8.7.tar.gz/libabi/inc/lgpl/zlibabi.h -> makemkv-oss-1.8.8.tar.gz/libabi/inc/lgpl/zlibabi.h Changed

makemkv-oss-1.8.8.tar.gz/libabi/pssl/ec.h Added

@@ -0,0 +1,597 @@
+/* crypto/ec/ec.h */
+/*
+ * Originally written by Bodo Moeller for the OpenSSL project.
+ */
+/**
+ * \file crypto/ec/ec.h Include file for the OpenSSL EC functions
+ * \author Originally written by Bodo Moeller for the OpenSSL project
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT 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.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * Portions of the attached software ("Contribution") are developed by 
+ * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
+ *
+ * The Contribution is licensed pursuant to the OpenSSL open source
+ * license provided above.
+ *
+ * The elliptic curve binary polynomial software is originally written by 
+ * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
+
+#ifndef HEADER_EC_H
+#define HEADER_EC_H
+
+#include <openssl/opensslconf.h>
+#include <openssl/bn.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#elif defined(__SUNPRO_C)
+# if __SUNPRO_C >= 0x520
+# pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
+# endif
+#endif
+
+  
+#ifndef OPENSSL_ECC_MAX_FIELD_BITS
+# define OPENSSL_ECC_MAX_FIELD_BITS 661
+#endif
+
+typedef struct ec_method_st EC_METHOD;
+
+typedef struct ec_group_st
+	/*
+	 EC_METHOD *meth;
+	 -- field definition
+	 -- curve coefficients
+	 -- optional generator with associated information (order, cofactor)
+	 -- optional extra data (precomputed table for fast computation of multiples of generator)
+	 -- ASN1 stuff
+	*/
+	EC_GROUP;
+
+typedef struct ec_point_st EC_POINT;
+
+
+/********************************************************************/
+/*               EC_METHODs for curves over GF(p)                   */       
+/********************************************************************/
+
+/** Returns GFp methods using montgomery multiplication.
+ *  \return  EC_METHOD object
+ */
+static const EC_METHOD *EC_GFp_mont_method(void);
+
+
+/********************************************************************/
+/*                   EC_GROUP functions                             */
+/********************************************************************/
+
+/** Creates a new EC_GROUP object
+ *  \param   meth  EC_METHOD to use
+ *  \return  newly created EC_GROUP object or NULL in case of an error.
+ */
+static EC_GROUP *EC_GROUP_new(const EC_METHOD *meth);
+
+/** Frees a EC_GROUP object
+ *  \param  group  EC_GROUP object to be freed.
+ */
+static void EC_GROUP_free(EC_GROUP *group);
+
+/** Clears and frees a EC_GROUP object
+ *  \param  group  EC_GROUP object to be cleared and freed.
+ */
+static void EC_GROUP_clear_free(EC_GROUP *group);
+
+/** Copies EC_GROUP objects. Note: both EC_GROUPs must use the same EC_METHOD.
+ *  \param  dst  destination EC_GROUP object
+ *  \param  src  source EC_GROUP object
+ *  \return 1 on success and 0 if an error occurred.
+ */
+static int EC_GROUP_copy(EC_GROUP *dst, const EC_GROUP *src);
+
+/** Creates a new EC_GROUP object and copies the copies the content
+ *  form src to the newly created EC_KEY object
+ *  \param  src  source EC_GROUP object
+ *  \return newly created EC_GROUP object or NULL in case of an error.
+ */
+static EC_GROUP *EC_GROUP_dup(const EC_GROUP *src);
+
+/** Sets the generator and it's order/cofactor of a EC_GROUP object.
+ *  \param  group      EC_GROUP object 
+ *  \param  generator  EC_POINT object with the generator.
+ *  \param  order      the order of the group generated by the generator.
+ *  \param  cofactor   the index of the sub-group generated by the generator
+ *                     in the group of all points on the elliptic curve.
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator, const BIGNUM *order, const BIGNUM *cofactor);
+
+/** Returns the generator of a EC_GROUP object.
+ *  \param  group  EC_GROUP object
+ *  \return the currently used generator (possibly NULL).
+ */
+static const EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *group);
+
+/** Gets the order of a EC_GROUP
+ *  \param  group  EC_GROUP object
+ *  \param  order  BIGNUM to which the order is copied
+ *  \param  ctx    BN_CTX object (optional)
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_GROUP_get_order(const EC_GROUP *group, BIGNUM *order, BN_CTX *ctx);
+
+/** Sets the parameter of a ec over GFp defined by y^2 = x^3 + a*x + b
+ *  \param  group  EC_GROUP object
+ *  \param  p      BIGNUM with the prime number
+ *  \param  a      BIGNUM with parameter a of the equation
+ *  \param  b      BIGNUM with parameter b of the equation
+ *  \param  ctx    BN_CTX object (optional)
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
+
+/********************************************************************/
+/*                    EC_POINT functions                            */
+/********************************************************************/
+
+/** Creates a new EC_POINT object for the specified EC_GROUP
+ *  \param  group  EC_GROUP the underlying EC_GROUP object
+ *  \return newly created EC_POINT object or NULL if an error occurred
+ */
+static EC_POINT *EC_POINT_new(const EC_GROUP *group);
+
+/** Frees a EC_POINT object
+ *  \param  point  EC_POINT object to be freed
+ */
+static void EC_POINT_free(EC_POINT *point);
+
+/** Clears and frees a EC_POINT object
+ *  \param  point  EC_POINT object to be cleared and freed
+ */
+static void EC_POINT_clear_free(EC_POINT *point);
+
+/** Copies EC_POINT object
+ *  \param  dst  destination EC_POINT object
+ *  \param  src  source EC_POINT object
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_POINT_copy(EC_POINT *dst, const EC_POINT *src);
+
+/** Creates a new EC_POINT object and copies the content of the supplied
+ *  EC_POINT
+ *  \param  src    source EC_POINT object
+ *  \param  group  underlying the EC_GROUP object
+ *  \return newly created EC_POINT object or NULL if an error occurred 
+ */
+static EC_POINT *EC_POINT_dup(const EC_POINT *src, const EC_GROUP *group);
+
+/** Sets a point to infinity (neutral element)
+ *  \param  group  underlying EC_GROUP object
+ *  \param  point  EC_POINT to set to infinity
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_POINT_set_to_infinity(const EC_GROUP *group, EC_POINT *point);
+
+/** Sets the affine coordinates of a EC_POINT over GFp
+ *  \param  group  underlying EC_GROUP object
+ *  \param  p      EC_POINT object
+ *  \param  x      BIGNUM with the x-coordinate
+ *  \param  y      BIGNUM with the y-coordinate
+ *  \param  ctx    BN_CTX object (optional)
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
+	const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx);
+
+/** Gets the affine coordinates of a EC_POINT over GFp
+ *  \param  group  underlying EC_GROUP object
+ *  \param  p      EC_POINT object
+ *  \param  x      BIGNUM for the x-coordinate
+ *  \param  y      BIGNUM for the y-coordinate
+ *  \param  ctx    BN_CTX object (optional)
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
+	const EC_POINT *p, BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
+
+
+/********************************************************************/
+/*         functions for doing EC_POINT arithmetic                  */
+/********************************************************************/
+
+/** Computes the sum of two EC_POINT 
+ *  \param  group  underlying EC_GROUP object
+ *  \param  r      EC_POINT object for the result (r = a + b)
+ *  \param  a      EC_POINT object with the first summand
+ *  \param  b      EC_POINT object with the second summand
+ *  \param  ctx    BN_CTX object (optional)
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx);
+
+/** Computes the double of a EC_POINT
+ *  \param  group  underlying EC_GROUP object
+ *  \param  r      EC_POINT object for the result (r = 2 * a)
+ *  \param  a      EC_POINT object 
+ *  \param  ctx    BN_CTX object (optional)
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *ctx);
+
+/** Computes the inverse of a EC_POINT
+ *  \param  group  underlying EC_GROUP object
+ *  \param  a      EC_POINT object to be inverted (it's used for the result as well)
+ *  \param  ctx    BN_CTX object (optional)
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_POINT_invert(const EC_GROUP *group, EC_POINT *a, BN_CTX *ctx);
+
+/** Checks whether the point is the neutral element of the group
+ *  \param  group  the underlying EC_GROUP object
+ *  \param  p      EC_POINT object
+ *  \return 1 if the point is the neutral element and 0 otherwise
+ */
+static int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *p);
+
+/** Compares two EC_POINTs 
+ *  \param  group  underlying EC_GROUP object
+ *  \param  a      first EC_POINT object
+ *  \param  b      second EC_POINT object
+ *  \param  ctx    BN_CTX object (optional)
+ *  \return 0 if both points are equal and a value != 0 otherwise
+ */
+static int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx);
+
+static int EC_POINTs_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx);
+
+/** Computes r = generator * n sum_{i=0}^num p[i] * m[i]
+ *  \param  group  underlying EC_GROUP object
+ *  \param  r      EC_POINT object for the result
+ *  \param  n      BIGNUM with the multiplier for the group generator (optional)
+ *  \param  num    number futher summands
+ *  \param  p      array of size num of EC_POINT objects
+ *  \param  m      array of size num of BIGNUM objects
+ *  \param  ctx    BN_CTX object (optional)
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n, size_t num, const EC_POINT *p[], const BIGNUM *m[], BN_CTX *ctx);
+
+/** Computes r = generator * n + q * m
+ *  \param  group  underlying EC_GROUP object
+ *  \param  r      EC_POINT object for the result
+ *  \param  n      BIGNUM with the multiplier for the group generator (optional)
+ *  \param  q      EC_POINT object with the first factor of the second summand
+ *  \param  m      BIGNUM with the second factor of the second summand
+ *  \param  ctx    BN_CTX object (optional)
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n, const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx);
+
+/** Stores multiples of generator for faster point multiplication
+ *  \param  group  EC_GROUP object
+ *  \param  ctx    BN_CTX object (optional)
+ *  \return 1 on success and 0 if an error occured
+ */
+static int EC_GROUP_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
+
+
+/********************************************************************/
+/*                      EC_KEY functions                            */
+/********************************************************************/
+
+typedef struct ec_key_st EC_KEY;
+
+/** Creates a new EC_KEY object.
+ *  \return EC_KEY object or NULL if an error occurred.
+ */
+static EC_KEY *EC_KEY_new(void);
+
+/** Frees a EC_KEY object.
+ *  \param  key  EC_KEY object to be freed.
+ */
+static void EC_KEY_free(EC_KEY *key);
+
+/** Returns the EC_GROUP object of a EC_KEY object
+ *  \param  key  EC_KEY object
+ *  \return the EC_GROUP object (possibly NULL).
+ */
+static const EC_GROUP *EC_KEY_get0_group(const EC_KEY *key);
+
+/** Sets the EC_GROUP of a EC_KEY object.
+ *  \param  key    EC_KEY object
+ *  \param  group  EC_GROUP to use in the EC_KEY object (note: the EC_KEY
+ *                 object will use an own copy of the EC_GROUP).
+ *  \return 1 on success and 0 if an error occurred.
+ */
+static int EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group);
+
+/** Returns the private key of a EC_KEY object.
+ *  \param  key  EC_KEY object
+ *  \return a BIGNUM with the private key (possibly NULL).
+ */
+static const BIGNUM *EC_KEY_get0_private_key(const EC_KEY *key);
+
+/** Sets the private key of a EC_KEY object.
+ *  \param  key  EC_KEY object
+ *  \param  prv  BIGNUM with the private key (note: the EC_KEY object
+ *               will use an own copy of the BIGNUM).
+ *  \return 1 on success and 0 if an error occurred.
+ */
+static int EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *prv);
+
+/** Returns the public key of a EC_KEY object.
+ *  \param  key  the EC_KEY object
+ *  \return a EC_POINT object with the public key (possibly NULL)
+ */
+static const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *key);
+
+/** Sets the public key of a EC_KEY object.
+ *  \param  key  EC_KEY object
+ *  \param  pub  EC_POINT object with the public key (note: the EC_KEY object
+ *               will use an own copy of the EC_POINT object).
+ *  \return 1 on success and 0 if an error occurred.
+ */
+static int EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub);
+
+#ifndef __cplusplus
+#if defined(__SUNPRO_C)
+#  if __SUNPRO_C >= 0x520
+# pragma error_messages (default,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
+#  endif
+# endif
+#endif
+
+/* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+
+/* Error codes for the EC functions. */
+
+/* Function codes. */
+#define EC_F_BN_TO_FELEM				 224
+#define EC_F_COMPUTE_WNAF				 143
+#define EC_F_D2I_ECPARAMETERS				 144
+#define EC_F_D2I_ECPKPARAMETERS				 145
+#define EC_F_D2I_ECPRIVATEKEY				 146
+#define EC_F_DO_EC_KEY_PRINT				 221
+#define EC_F_ECKEY_PARAM2TYPE				 223
+#define EC_F_ECKEY_PARAM_DECODE				 212
+#define EC_F_ECKEY_PRIV_DECODE				 213
+#define EC_F_ECKEY_PRIV_ENCODE				 214
+#define EC_F_ECKEY_PUB_DECODE				 215
+#define EC_F_ECKEY_PUB_ENCODE				 216
+#define EC_F_ECKEY_TYPE2PARAM				 220
+#define EC_F_ECPARAMETERS_PRINT				 147
+#define EC_F_ECPARAMETERS_PRINT_FP			 148
+#define EC_F_ECPKPARAMETERS_PRINT			 149
+#define EC_F_ECPKPARAMETERS_PRINT_FP			 150
+#define EC_F_ECP_NIST_MOD_192				 203
+#define EC_F_ECP_NIST_MOD_224				 204
+#define EC_F_ECP_NIST_MOD_256				 205
+#define EC_F_ECP_NIST_MOD_521				 206
+#define EC_F_EC_ASN1_GROUP2CURVE			 153
+#define EC_F_EC_ASN1_GROUP2FIELDID			 154
+#define EC_F_EC_ASN1_GROUP2PARAMETERS			 155
+#define EC_F_EC_ASN1_GROUP2PKPARAMETERS			 156
+#define EC_F_EC_ASN1_PARAMETERS2GROUP			 157
+#define EC_F_EC_ASN1_PKPARAMETERS2GROUP			 158
+#define EC_F_EC_EX_DATA_SET_DATA			 211
+#define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY		 208
+#define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT	 159
+#define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE		 195
+#define EC_F_EC_GF2M_SIMPLE_OCT2POINT			 160
+#define EC_F_EC_GF2M_SIMPLE_POINT2OCT			 161
+#define EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES 162
+#define EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES 163
+#define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES	 164
+#define EC_F_EC_GFP_MONT_FIELD_DECODE			 133
+#define EC_F_EC_GFP_MONT_FIELD_ENCODE			 134
+#define EC_F_EC_GFP_MONT_FIELD_MUL			 131
+#define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE		 209
+#define EC_F_EC_GFP_MONT_FIELD_SQR			 132
+#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE		 189
+#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP		 135
+#define EC_F_EC_GFP_NISTP224_GROUP_SET_CURVE		 225
+#define EC_F_EC_GFP_NISTP224_POINTS_MUL			 228
+#define EC_F_EC_GFP_NISTP224_POINT_GET_AFFINE_COORDINATES 226
+#define EC_F_EC_GFP_NISTP256_GROUP_SET_CURVE		 230
+#define EC_F_EC_GFP_NISTP256_POINTS_MUL			 231
+#define EC_F_EC_GFP_NISTP256_POINT_GET_AFFINE_COORDINATES 232
+#define EC_F_EC_GFP_NISTP521_GROUP_SET_CURVE		 233
+#define EC_F_EC_GFP_NISTP521_POINTS_MUL			 234
+#define EC_F_EC_GFP_NISTP521_POINT_GET_AFFINE_COORDINATES 235
+#define EC_F_EC_GFP_NIST_FIELD_MUL			 200
+#define EC_F_EC_GFP_NIST_FIELD_SQR			 201
+#define EC_F_EC_GFP_NIST_GROUP_SET_CURVE		 202
+#define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT	 165
+#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE		 166
+#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP		 100
+#define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR		 101
+#define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE			 102
+#define EC_F_EC_GFP_SIMPLE_OCT2POINT			 103
+#define EC_F_EC_GFP_SIMPLE_POINT2OCT			 104
+#define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE		 137
+#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES	 167
+#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP 105
+#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES	 168
+#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP 128
+#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES	 169
+#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP 129
+#define EC_F_EC_GROUP_CHECK				 170
+#define EC_F_EC_GROUP_CHECK_DISCRIMINANT		 171
+#define EC_F_EC_GROUP_COPY				 106
+#define EC_F_EC_GROUP_GET0_GENERATOR			 139
+#define EC_F_EC_GROUP_GET_COFACTOR			 140
+#define EC_F_EC_GROUP_GET_CURVE_GF2M			 172
+#define EC_F_EC_GROUP_GET_CURVE_GFP			 130
+#define EC_F_EC_GROUP_GET_DEGREE			 173
+#define EC_F_EC_GROUP_GET_ORDER				 141
+#define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS		 193
+#define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS		 194
+#define EC_F_EC_GROUP_NEW				 108
+#define EC_F_EC_GROUP_NEW_BY_CURVE_NAME			 174
+#define EC_F_EC_GROUP_NEW_FROM_DATA			 175
+#define EC_F_EC_GROUP_PRECOMPUTE_MULT			 142
+#define EC_F_EC_GROUP_SET_CURVE_GF2M			 176
+#define EC_F_EC_GROUP_SET_CURVE_GFP			 109
+#define EC_F_EC_GROUP_SET_EXTRA_DATA			 110
+#define EC_F_EC_GROUP_SET_GENERATOR			 111
+#define EC_F_EC_KEY_CHECK_KEY				 177
+#define EC_F_EC_KEY_COPY				 178
+#define EC_F_EC_KEY_GENERATE_KEY			 179
+#define EC_F_EC_KEY_NEW					 182
+#define EC_F_EC_KEY_PRINT				 180
+#define EC_F_EC_KEY_PRINT_FP				 181
+#define EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES	 229
+#define EC_F_EC_POINTS_MAKE_AFFINE			 136
+#define EC_F_EC_POINT_ADD				 112
+#define EC_F_EC_POINT_CMP				 113
+#define EC_F_EC_POINT_COPY				 114
+#define EC_F_EC_POINT_DBL				 115
+#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M	 183
+#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP	 116
+#define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP	 117
+#define EC_F_EC_POINT_INVERT				 210
+#define EC_F_EC_POINT_IS_AT_INFINITY			 118
+#define EC_F_EC_POINT_IS_ON_CURVE			 119
+#define EC_F_EC_POINT_MAKE_AFFINE			 120
+#define EC_F_EC_POINT_MUL				 184
+#define EC_F_EC_POINT_NEW				 121
+#define EC_F_EC_POINT_OCT2POINT				 122
+#define EC_F_EC_POINT_POINT2OCT				 123
+#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M	 185
+#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP	 124
+#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M	 186
+#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP	 125
+#define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP	 126
+#define EC_F_EC_POINT_SET_TO_INFINITY			 127
+#define EC_F_EC_PRE_COMP_DUP				 207
+#define EC_F_EC_PRE_COMP_NEW				 196
+#define EC_F_EC_WNAF_MUL				 187
+#define EC_F_EC_WNAF_PRECOMPUTE_MULT			 188
+#define EC_F_I2D_ECPARAMETERS				 190
+#define EC_F_I2D_ECPKPARAMETERS				 191
+#define EC_F_I2D_ECPRIVATEKEY				 192
+#define EC_F_I2O_ECPUBLICKEY				 151
+#define EC_F_NISTP224_PRE_COMP_NEW			 227
+#define EC_F_NISTP256_PRE_COMP_NEW			 236
+#define EC_F_NISTP521_PRE_COMP_NEW			 237
+#define EC_F_O2I_ECPUBLICKEY				 152
+#define EC_F_OLD_EC_PRIV_DECODE				 222
+#define EC_F_PKEY_EC_CTRL				 197
+#define EC_F_PKEY_EC_CTRL_STR				 198
+#define EC_F_PKEY_EC_DERIVE				 217
+#define EC_F_PKEY_EC_KEYGEN				 199
+#define EC_F_PKEY_EC_PARAMGEN				 219
+#define EC_F_PKEY_EC_SIGN				 218
+
+/* Reason codes. */
+#define EC_R_ASN1_ERROR					 115
+#define EC_R_ASN1_UNKNOWN_FIELD				 116
+#define EC_R_BIGNUM_OUT_OF_RANGE			 144
+#define EC_R_BUFFER_TOO_SMALL				 100
+#define EC_R_COORDINATES_OUT_OF_RANGE			 146
+#define EC_R_D2I_ECPKPARAMETERS_FAILURE			 117
+#define EC_R_DECODE_ERROR				 142
+#define EC_R_DISCRIMINANT_IS_ZERO			 118
+#define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE		 119
+#define EC_R_FIELD_TOO_LARGE				 143
+#define EC_R_GF2M_NOT_SUPPORTED				 147
+#define EC_R_GROUP2PKPARAMETERS_FAILURE			 120
+#define EC_R_I2D_ECPKPARAMETERS_FAILURE			 121
+#define EC_R_INCOMPATIBLE_OBJECTS			 101
+#define EC_R_INVALID_ARGUMENT				 112
+#define EC_R_INVALID_COMPRESSED_POINT			 110
+#define EC_R_INVALID_COMPRESSION_BIT			 109
+#define EC_R_INVALID_CURVE				 141
+#define EC_R_INVALID_DIGEST_TYPE			 138
+#define EC_R_INVALID_ENCODING				 102
+#define EC_R_INVALID_FIELD				 103
+#define EC_R_INVALID_FORM				 104
+#define EC_R_INVALID_GROUP_ORDER			 122
+#define EC_R_INVALID_PENTANOMIAL_BASIS			 132
+#define EC_R_INVALID_PRIVATE_KEY			 123
+#define EC_R_INVALID_TRINOMIAL_BASIS			 137
+#define EC_R_KEYS_NOT_SET				 140
+#define EC_R_MISSING_PARAMETERS				 124
+#define EC_R_MISSING_PRIVATE_KEY			 125
+#define EC_R_NOT_A_NIST_PRIME				 135
+#define EC_R_NOT_A_SUPPORTED_NIST_PRIME			 136
+#define EC_R_NOT_IMPLEMENTED				 126
+#define EC_R_NOT_INITIALIZED				 111
+#define EC_R_NO_FIELD_MOD				 133
+#define EC_R_NO_PARAMETERS_SET				 139
+#define EC_R_PASSED_NULL_PARAMETER			 134
+#define EC_R_PKPARAMETERS2GROUP_FAILURE			 127
+#define EC_R_POINT_AT_INFINITY				 106
+#define EC_R_POINT_IS_NOT_ON_CURVE			 107
+#define EC_R_SLOT_FULL					 108
+#define EC_R_UNDEFINED_GENERATOR			 113
+#define EC_R_UNDEFINED_ORDER				 128
+#define EC_R_UNKNOWN_GROUP				 129
+#define EC_R_UNKNOWN_ORDER				 114
+#define EC_R_UNSUPPORTED_FIELD				 131
+#define EC_R_WRONG_CURVE_PARAMETERS			 145
+#define EC_R_WRONG_ORDER				 130
+
+#ifdef  __cplusplus
+}
+#endif
+#endif

makemkv-oss-1.8.7.tar.gz/libabi/pssl/ec_key.c -> makemkv-oss-1.8.8.tar.gz/libabi/pssl/ec_key.c Changed

@@ -63,12 +63,8 @@
 
 #include <string.h>
 #include "ec_lcl.h"
-#include <openssl/err.h>
-#include <string.h>
-
-#ifndef SKIP_PRIVATE_OSSL
 
-EC_KEY *EC_KEY_new(void)
+static EC_KEY *EC_KEY_new(void)
 	{
 	EC_KEY *ret;
 
@@ -79,37 +75,16 @@
 		return(NULL);
 		}
 
-	ret->version = 1;	
 	ret->group   = NULL;
 	ret->pub_key = NULL;
 	ret->priv_key= NULL;
-	ret->enc_flag= 0; 
-	ret->conv_form = POINT_CONVERSION_UNCOMPRESSED;
-	ret->references= 1;
-	ret->method_data = NULL;
 	return(ret);
 	}
 
-
-void EC_KEY_free(EC_KEY *r)
+static void EC_KEY_free(EC_KEY *r)
 	{
-	int i;
-
 	if (r == NULL) return;
 
-	i=CRYPTO_add(&r->references,-1,CRYPTO_LOCK_EC);
-#ifdef REF_PRINT
-	REF_PRINT("EC_KEY",r);
-#endif
-	if (i > 0) return;
-#ifdef REF_CHECK
-	if (i < 0)
-		{
-		fprintf(stderr,"EC_KEY_free, bad reference count\n");
-		abort();
-		}
-#endif
-
 	if (r->group    != NULL) 
 		EC_GROUP_free(r->group);
 	if (r->pub_key  != NULL)
@@ -117,19 +92,15 @@
 	if (r->priv_key != NULL)
 		BN_clear_free(r->priv_key);
 
-	EC_EX_DATA_free_all_data(&r->method_data);
-
-	OPENSSL_cleanse((void *)r, sizeof(EC_KEY));
-
 	OPENSSL_free(r);
 	}
 
-const EC_GROUP *EC_KEY_get0_group(const EC_KEY *key)
+static const EC_GROUP *EC_KEY_get0_group(const EC_KEY *key)
 	{
 	return key->group;
 	}
 
-int EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group)
+static int EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group)
 	{
 	if (key->group != NULL)
 		EC_GROUP_free(key->group);
@@ -137,12 +108,12 @@
 	return (key->group == NULL) ? 0 : 1;
 	}
 
-const BIGNUM *EC_KEY_get0_private_key(const EC_KEY *key)
+static const BIGNUM *EC_KEY_get0_private_key(const EC_KEY *key)
 	{
 	return key->priv_key;
 	}
 
-int EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *priv_key)
+static int EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *priv_key)
 	{
 	if (key->priv_key)
 		BN_clear_free(key->priv_key);
@@ -150,12 +121,12 @@
 	return (key->priv_key == NULL) ? 0 : 1;
 	}
 
-const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *key)
+static const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *key)
 	{
 	return key->pub_key;
 	}
 
-int EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub_key)
+static int EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub_key)
 	{
 	if (key->pub_key != NULL)
 		EC_POINT_free(key->pub_key);
@@ -163,14 +134,3 @@
 	return (key->pub_key == NULL) ? 0 : 1;
 	}
 
-unsigned int EC_KEY_get_enc_flags(const EC_KEY *key)
-	{
-	return key->enc_flag;
-	}
-
-void EC_KEY_set_enc_flags(EC_KEY *key, unsigned int flags)
-	{
-	key->enc_flag = flags;
-	}
-
-#endif

makemkv-oss-1.8.7.tar.gz/libabi/pssl/ec_lcl.h -> makemkv-oss-1.8.8.tar.gz/libabi/pssl/ec_lcl.h Changed

@@ -3,7 +3,7 @@
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
 /* ====================================================================
- * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2010 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -68,14 +68,13 @@
  * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
  *
  */
-
-#include <openssl/opensslconf.h>
-#if defined(OPENSSL_NO_EC) || defined(USE_PRIVATE_OSSL)
+#ifndef HEADER_EC_LCL_H
+#define HEADER_EC_LCL_H
 
 #include <stdlib.h>
 
 #include <openssl/obj_mac.h>
-#include <pssl/ec.h>
+#include "ec.h"
 #include <openssl/bn.h>
 
 #if defined(__SUNPRO_C)
@@ -84,120 +83,13 @@
 # endif
 #endif
 
-/* Structure details are not part of the exported interface,
- * so all this may change in future versions. */
-
-struct ec_method_st {
-	/* used by EC_METHOD_get_field_type: */
-	int field_type; /* a NID */
-
-	/* used by EC_GROUP_new, EC_GROUP_free, EC_GROUP_clear_free, EC_GROUP_copy: */
-	int (*group_init)(EC_GROUP *);
-	void (*group_finish)(EC_GROUP *);
-	void (*group_clear_finish)(EC_GROUP *);
-	int (*group_copy)(EC_GROUP *, const EC_GROUP *);
-
-	/* used by EC_GROUP_set_curve_GFp, EC_GROUP_get_curve_GFp, */
-	/* EC_GROUP_set_curve_GF2m, and EC_GROUP_get_curve_GF2m: */
-	int (*group_set_curve)(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-	int (*group_get_curve)(const EC_GROUP *, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *);
-
-	/* used by EC_GROUP_get_degree: */
-	int (*group_get_degree)(const EC_GROUP *);
-
-	/* used by EC_GROUP_check: */
-	int (*group_check_discriminant)(const EC_GROUP *, BN_CTX *);
-
-	/* used by EC_POINT_new, EC_POINT_free, EC_POINT_clear_free, EC_POINT_copy: */
-	int (*point_init)(EC_POINT *);
-	void (*point_finish)(EC_POINT *);
-	void (*point_clear_finish)(EC_POINT *);
-	int (*point_copy)(EC_POINT *, const EC_POINT *);
-
-	/* used by EC_POINT_set_to_infinity,
-	 * EC_POINT_set_Jprojective_coordinates_GFp,
-	 * EC_POINT_get_Jprojective_coordinates_GFp,
-	 * EC_POINT_set_affine_coordinates_GFp,     ..._GF2m,
-	 * EC_POINT_get_affine_coordinates_GFp,     ..._GF2m,
-	 * EC_POINT_set_compressed_coordinates_GFp, ..._GF2m:
-	 */
-	int (*point_set_to_infinity)(const EC_GROUP *, EC_POINT *);
-	int (*point_set_Jprojective_coordinates_GFp)(const EC_GROUP *, EC_POINT *,
-		const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *);
-	int (*point_get_Jprojective_coordinates_GFp)(const EC_GROUP *, const EC_POINT *,
-		BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *);
-	int (*point_set_affine_coordinates)(const EC_GROUP *, EC_POINT *,
-		const BIGNUM *x, const BIGNUM *y, BN_CTX *);
-	int (*point_get_affine_coordinates)(const EC_GROUP *, const EC_POINT *,
-		BIGNUM *x, BIGNUM *y, BN_CTX *);
-	int (*point_set_compressed_coordinates)(const EC_GROUP *, EC_POINT *,
-		const BIGNUM *x, int y_bit, BN_CTX *);
-
-	/* used by EC_POINT_point2oct, EC_POINT_oct2point: */
-	size_t (*point2oct)(const EC_GROUP *, const EC_POINT *, point_conversion_form_t form,
-	        unsigned char *buf, size_t len, BN_CTX *);
-	int (*oct2point)(const EC_GROUP *, EC_POINT *,
-	        const unsigned char *buf, size_t len, BN_CTX *);
-
-	/* used by EC_POINT_add, EC_POINT_dbl, ECP_POINT_invert: */
-	int (*add)(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *);
-	int (*dbl)(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *);
-	int (*invert)(const EC_GROUP *, EC_POINT *, BN_CTX *);
-
-	/* used by EC_POINT_is_at_infinity, EC_POINT_is_on_curve, EC_POINT_cmp: */
-	int (*is_at_infinity)(const EC_GROUP *, const EC_POINT *);
-	int (*is_on_curve)(const EC_GROUP *, const EC_POINT *, BN_CTX *);
-	int (*point_cmp)(const EC_GROUP *, const EC_POINT *a, const EC_POINT *b, BN_CTX *);
-
-	/* used by EC_POINT_make_affine, EC_POINTs_make_affine: */
-	int (*make_affine)(const EC_GROUP *, EC_POINT *, BN_CTX *);
-	int (*points_make_affine)(const EC_GROUP *, size_t num, EC_POINT *[], BN_CTX *);
-
-	/* used by EC_POINTs_mul, EC_POINT_mul, EC_POINT_precompute_mult, EC_POINT_have_precompute_mult
-	 * (default implementations are used if the 'mul' pointer is 0): */
-	int (*mul)(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
-		size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *);
-	int (*precompute_mult)(EC_GROUP *group, BN_CTX *);
-	int (*have_precompute_mult)(const EC_GROUP *group);
-
-
-	/* internal functions */
-
-	/* 'field_mul', 'field_sqr', and 'field_div' can be used by 'add' and 'dbl' so that
-	 * the same implementations of point operations can be used with different
-	 * optimized implementations of expensive field operations: */
-	int (*field_mul)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-	int (*field_sqr)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
-	int (*field_div)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-
-	int (*field_encode)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); /* e.g. to Montgomery */
-	int (*field_decode)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); /* e.g. from Montgomery */
-	int (*field_set_to_one)(const EC_GROUP *, BIGNUM *r, BN_CTX *);
-} /* EC_METHOD */;
-
-typedef struct ec_extra_data_st {
-	struct ec_extra_data_st *next;
-	void *data;
-	void *(*dup_func)(void *);
-	void (*free_func)(void *);
-	void (*clear_free_func)(void *);
-} EC_EXTRA_DATA; /* used in EC_GROUP */
+typedef struct ec_pre_comp_st EC_PRE_COMP;
 
 struct ec_group_st {
-	const EC_METHOD *meth;
-
+        struct ec_pre_comp_st *precomp;
 	EC_POINT *generator; /* optional */
 	BIGNUM order, cofactor;
 
-	int curve_name;/* optional NID for named curve */
-	int asn1_flag; /* flag to control the asn1 encoding */
-	point_conversion_form_t asn1_form;
-
-	unsigned char *seed; /* optional seed for parameters (appears in ASN1) */
-	size_t seed_len;
-
-	EC_EXTRA_DATA *extra_data; /* linked list */
-
 	/* The following members are handled by the method functions,
 	 * even if they appear generic */
 	
@@ -207,11 +99,14 @@
 	               * irreducible polynomial defining the field.
 	               */
 
-	unsigned int poly[5]; /* Field specification for curves over GF(2^m).
-	                       * The irreducible f(t) is then of the form:
-	                       *     t^poly[0] + t^poly[1] + ... + t^poly[k]
-	                       * where m = poly[0] > poly[1] > ... > poly[k] = 0.
-	                       */
+	int poly[6]; /* Field specification for curves over GF(2^m).
+	              * The irreducible f(t) is then of the form:
+	              *     t^poly[0] + t^poly[1] + ... + t^poly[k]
+	              * where m = poly[0] > poly[1] > ... > poly[k] = 0.
+	              * The array is terminated with poly[k+1]=-1.
+	              * All elliptic curve irreducibles have at most 5
+	              * non-zero terms.
+	              */
 
 	BIGNUM a, b; /* Curve coefficients.
 	              * (Here the assumption is that BIGNUMs can be used
@@ -232,42 +127,15 @@
 } /* EC_GROUP */;
 
 struct ec_key_st {
-	int version;
-
 	EC_GROUP *group;
 
 	EC_POINT *pub_key;
 	BIGNUM	 *priv_key;
 
-	unsigned int enc_flag;
-	point_conversion_form_t conv_form;
-
-	int 	references;
-
-	EC_EXTRA_DATA *method_data;
 } /* EC_KEY */;
 
-/* Basically a 'mixin' for extra data, but available for EC_GROUPs/EC_KEYs only
- * (with visibility limited to 'package' level for now).
- * We use the function pointers as index for retrieval; this obviates
- * global ex_data-style index tables.
- */
-int EC_EX_DATA_set_data(EC_EXTRA_DATA **, void *data,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
-void *EC_EX_DATA_get_data(const EC_EXTRA_DATA *,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
-void EC_EX_DATA_free_data(EC_EXTRA_DATA **,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
-void EC_EX_DATA_clear_free_data(EC_EXTRA_DATA **,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
-void EC_EX_DATA_free_all_data(EC_EXTRA_DATA **);
-void EC_EX_DATA_clear_free_all_data(EC_EXTRA_DATA **);
-
-
 
 struct ec_point_st {
-	const EC_METHOD *meth;
-
 	/* All members except 'meth' are handled by the method functions,
 	 * even if they appear generic */
 
@@ -282,117 +150,51 @@
 
 /* method functions in ec_mult.c
  * (ec_lib.c uses these as defaults if group->method->mul is 0) */
-int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
+static int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 	size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *);
-int ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *);
-int ec_wNAF_have_precompute_mult(const EC_GROUP *group);
+static int ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *);
 
 
 /* method functions in ecp_smpl.c */
-int ec_GFp_simple_group_init(EC_GROUP *);
-void ec_GFp_simple_group_finish(EC_GROUP *);
-void ec_GFp_simple_group_clear_finish(EC_GROUP *);
-int ec_GFp_simple_group_copy(EC_GROUP *, const EC_GROUP *);
-int ec_GFp_simple_group_set_curve(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-int ec_GFp_simple_group_get_curve(const EC_GROUP *, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *);
-int ec_GFp_simple_group_get_degree(const EC_GROUP *);
-int ec_GFp_simple_group_check_discriminant(const EC_GROUP *, BN_CTX *);
-int ec_GFp_simple_point_init(EC_POINT *);
-void ec_GFp_simple_point_finish(EC_POINT *);
-void ec_GFp_simple_point_clear_finish(EC_POINT *);
-int ec_GFp_simple_point_copy(EC_POINT *, const EC_POINT *);
-int ec_GFp_simple_point_set_to_infinity(const EC_GROUP *, EC_POINT *);
-int ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *, EC_POINT *,
+static int ec_GFp_simple_group_init(EC_GROUP *);
+static void ec_GFp_simple_group_finish(EC_GROUP *);
+static void ec_GFp_simple_group_clear_finish(EC_GROUP *);
+static int ec_GFp_simple_group_copy(EC_GROUP *, const EC_GROUP *);
+static int ec_GFp_simple_group_set_curve(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
+static int ec_GFp_simple_point_init(EC_POINT *);
+static void ec_GFp_simple_point_finish(EC_POINT *);
+static void ec_GFp_simple_point_clear_finish(EC_POINT *);
+static int ec_GFp_simple_point_copy(EC_POINT *, const EC_POINT *);
+static int ec_GFp_simple_point_set_to_infinity(const EC_GROUP *, EC_POINT *);
+static int ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *, EC_POINT *,
 	const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *);
-int ec_GFp_simple_get_Jprojective_coordinates_GFp(const EC_GROUP *, const EC_POINT *,
-	BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *);
-int ec_GFp_simple_point_set_affine_coordinates(const EC_GROUP *, EC_POINT *,
+static int ec_GFp_simple_point_set_affine_coordinates(const EC_GROUP *, EC_POINT *,
 	const BIGNUM *x, const BIGNUM *y, BN_CTX *);
-int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *, const EC_POINT *,
+static int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *, const EC_POINT *,
 	BIGNUM *x, BIGNUM *y, BN_CTX *);
-int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, int y_bit, BN_CTX *);
-size_t ec_GFp_simple_point2oct(const EC_GROUP *, const EC_POINT *, point_conversion_form_t form,
-	unsigned char *buf, size_t len, BN_CTX *);
-int ec_GFp_simple_oct2point(const EC_GROUP *, EC_POINT *,
-	const unsigned char *buf, size_t len, BN_CTX *);
-int ec_GFp_simple_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *);
-int ec_GFp_simple_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *);
-int ec_GFp_simple_invert(const EC_GROUP *, EC_POINT *, BN_CTX *);
-int ec_GFp_simple_is_at_infinity(const EC_GROUP *, const EC_POINT *);
-int ec_GFp_simple_is_on_curve(const EC_GROUP *, const EC_POINT *, BN_CTX *);
-int ec_GFp_simple_cmp(const EC_GROUP *, const EC_POINT *a, const EC_POINT *b, BN_CTX *);
-int ec_GFp_simple_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *);
-int ec_GFp_simple_points_make_affine(const EC_GROUP *, size_t num, EC_POINT *[], BN_CTX *);
-int ec_GFp_simple_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-int ec_GFp_simple_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
+static int ec_GFp_simple_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *);
+static int ec_GFp_simple_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *);
+static int ec_GFp_simple_invert(const EC_GROUP *, EC_POINT *, BN_CTX *);
+static int ec_GFp_simple_is_at_infinity(const EC_GROUP *, const EC_POINT *);
+static int ec_GFp_simple_cmp(const EC_GROUP *, const EC_POINT *a, const EC_POINT *b, BN_CTX *);
+static int ec_GFp_simple_points_make_affine(const EC_GROUP *, size_t num, EC_POINT *[], BN_CTX *);
 
 
 /* method functions in ecp_mont.c */
-int ec_GFp_mont_group_init(EC_GROUP *);
-int ec_GFp_mont_group_set_curve(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-void ec_GFp_mont_group_finish(EC_GROUP *);
-void ec_GFp_mont_group_clear_finish(EC_GROUP *);
-int ec_GFp_mont_group_copy(EC_GROUP *, const EC_GROUP *);
-int ec_GFp_mont_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-int ec_GFp_mont_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
-int ec_GFp_mont_field_encode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
-int ec_GFp_mont_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
-int ec_GFp_mont_field_set_to_one(const EC_GROUP *, BIGNUM *r, BN_CTX *);
-
-
-/* method functions in ecp_nist.c */
-int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src);
-int ec_GFp_nist_group_set_curve(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-int ec_GFp_nist_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-int ec_GFp_nist_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
-
-
-/* method functions in ec2_smpl.c */
-int ec_GF2m_simple_group_init(EC_GROUP *);
-void ec_GF2m_simple_group_finish(EC_GROUP *);
-void ec_GF2m_simple_group_clear_finish(EC_GROUP *);
-int ec_GF2m_simple_group_copy(EC_GROUP *, const EC_GROUP *);
-int ec_GF2m_simple_group_set_curve(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-int ec_GF2m_simple_group_get_curve(const EC_GROUP *, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *);
-int ec_GF2m_simple_group_get_degree(const EC_GROUP *);
-int ec_GF2m_simple_group_check_discriminant(const EC_GROUP *, BN_CTX *);
-int ec_GF2m_simple_point_init(EC_POINT *);
-void ec_GF2m_simple_point_finish(EC_POINT *);
-void ec_GF2m_simple_point_clear_finish(EC_POINT *);
-int ec_GF2m_simple_point_copy(EC_POINT *, const EC_POINT *);
-int ec_GF2m_simple_point_set_to_infinity(const EC_GROUP *, EC_POINT *);
-int ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, const BIGNUM *y, BN_CTX *);
-int ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *, const EC_POINT *,
-	BIGNUM *x, BIGNUM *y, BN_CTX *);
-int ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, int y_bit, BN_CTX *);
-size_t ec_GF2m_simple_point2oct(const EC_GROUP *, const EC_POINT *, point_conversion_form_t form,
-	unsigned char *buf, size_t len, BN_CTX *);
-int ec_GF2m_simple_oct2point(const EC_GROUP *, EC_POINT *,
-	const unsigned char *buf, size_t len, BN_CTX *);
-int ec_GF2m_simple_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *);
-int ec_GF2m_simple_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *);
-int ec_GF2m_simple_invert(const EC_GROUP *, EC_POINT *, BN_CTX *);
-int ec_GF2m_simple_is_at_infinity(const EC_GROUP *, const EC_POINT *);
-int ec_GF2m_simple_is_on_curve(const EC_GROUP *, const EC_POINT *, BN_CTX *);
-int ec_GF2m_simple_cmp(const EC_GROUP *, const EC_POINT *a, const EC_POINT *b, BN_CTX *);
-int ec_GF2m_simple_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *);
-int ec_GF2m_simple_points_make_affine(const EC_GROUP *, size_t num, EC_POINT *[], BN_CTX *);
-int ec_GF2m_simple_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-int ec_GF2m_simple_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
-int ec_GF2m_simple_field_div(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-
-
-/* method functions in ec2_mult.c */
-int ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
-	size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *);
-int ec_GF2m_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
-int ec_GF2m_have_precompute_mult(const EC_GROUP *group);
-
-#else
-
-#define SKIP_PRIVATE_OSSL
-
-#endif
+static int ec_GFp_mont_group_init(EC_GROUP *);
+static int ec_GFp_mont_group_set_curve(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
+static void ec_GFp_mont_group_finish(EC_GROUP *);
+static void ec_GFp_mont_group_clear_finish(EC_GROUP *);
+static int ec_GFp_mont_group_copy(EC_GROUP *, const EC_GROUP *);
+static int ec_GFp_mont_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
+static int ec_GFp_mont_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
+static int ec_GFp_mont_field_encode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
+static int ec_GFp_mont_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
+static int ec_GFp_mont_field_set_to_one(const EC_GROUP *, BIGNUM *r, BN_CTX *);
+
+/* functions to manage EC_PRE_COMP within the EC_GROUP extra_data framework */
+static EC_PRE_COMP *ec_pre_comp_dup(EC_PRE_COMP *);
+static void ec_pre_comp_free(EC_PRE_COMP *);
+static void ec_pre_comp_clear_free(EC_PRE_COMP *);
+
+#endif /* HEADER_EC_LCL_H */

makemkv-oss-1.8.7.tar.gz/libabi/pssl/ec_lib.c -> makemkv-oss-1.8.8.tar.gz/libabi/pssl/ec_lib.c Changed

@@ -63,30 +63,17 @@
 
 #include <string.h>
 
-#include <openssl/err.h>
-#include <openssl/opensslv.h>
-
 #include "ec_lcl.h"
 
-#ifndef SKIP_PRIVATE_OSSL
-
-static const char EC_version[] = "EC (private)" OPENSSL_VERSION_PTEXT;
-
-
 /* functions for EC_GROUP objects */
 
-EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
+static EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
 	{
 	EC_GROUP *ret;
 
 	if (meth == NULL)
 		{
-		ECerr(EC_F_EC_GROUP_NEW, ERR_R_PASSED_NULL_PARAMETER);
-		return NULL;
-		}
-	if (meth->group_init == 0)
-		{
-		ECerr(EC_F_EC_GROUP_NEW, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+		ECerr(EC_F_EC_GROUP_NEW, EC_R_SLOT_FULL);
 		return NULL;
 		}
 
@@ -97,22 +84,12 @@
 		return NULL;
 		}
 
-	ret->meth = meth;
-
-	ret->extra_data = NULL;
-
 	ret->generator = NULL;
+	ret->precomp = NULL;
 	BN_init(&ret->order);
 	BN_init(&ret->cofactor);
 
-	ret->curve_name = 0;	
-	ret->asn1_flag  = 0;
-	ret->asn1_form  = POINT_CONVERSION_UNCOMPRESSED;
-
-	ret->seed = NULL;
-	ret->seed_len = 0;
-
-	if (!meth->group_init(ret))
+	if (!ec_GFp_mont_group_init(ret))
 		{
 		OPENSSL_free(ret);
 		return NULL;
@@ -122,83 +99,47 @@
 	}
 
 
-void EC_GROUP_free(EC_GROUP *group)
+static void EC_GROUP_free(EC_GROUP *group)
 	{
 	if (!group) return;
 
-	if (group->meth->group_finish != 0)
-		group->meth->group_finish(group);
-
-	EC_EX_DATA_free_all_data(&group->extra_data);
+		ec_GFp_mont_group_finish(group);
 
 	if (group->generator != NULL)
 		EC_POINT_free(group->generator);
+	if (group->precomp != NULL)
+		ec_pre_comp_free(group->precomp);
 	BN_free(&group->order);
 	BN_free(&group->cofactor);
 
-	if (group->seed)
-		OPENSSL_free(group->seed);
-
 	OPENSSL_free(group);
 	}
  
 
-void EC_GROUP_clear_free(EC_GROUP *group)
+static void EC_GROUP_clear_free(EC_GROUP *group)
 	{
 	if (!group) return;
 
-	if (group->meth->group_clear_finish != 0)
-		group->meth->group_clear_finish(group);
-	else if (group->meth->group_finish != 0)
-		group->meth->group_finish(group);
-
-	EC_EX_DATA_clear_free_all_data(&group->extra_data);
+		ec_GFp_mont_group_clear_finish(group);
 
 	if (group->generator != NULL)
 		EC_POINT_clear_free(group->generator);
+	if (group->precomp != NULL)
+		ec_pre_comp_clear_free(group->precomp);
 	BN_clear_free(&group->order);
 	BN_clear_free(&group->cofactor);
 
-	if (group->seed)
-		{
-		OPENSSL_cleanse(group->seed, group->seed_len);
-		OPENSSL_free(group->seed);
-		}
-
 	OPENSSL_cleanse(group, sizeof *group);
 	OPENSSL_free(group);
 	}
 
 
-int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
+static int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
 	{
-	EC_EXTRA_DATA *d;
 
-	if (dest->meth->group_copy == 0)
-		{
-		ECerr(EC_F_EC_GROUP_COPY, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (dest->meth != src->meth)
-		{
-		ECerr(EC_F_EC_GROUP_COPY, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
 	if (dest == src)
 		return 1;
 	
-	EC_EX_DATA_free_all_data(&dest->extra_data);
-
-	for (d = src->extra_data; d != NULL; d = d->next)
-		{
-		void *t = d->dup_func(d->data);
-		
-		if (t == NULL)
-			return 0;
-		if (!EC_EX_DATA_set_data(&dest->extra_data, t, d->dup_func, d->free_func, d->clear_free_func))
-			return 0;
-		}
-
 	if (src->generator != NULL)
 		{
 		if (dest->generator == NULL)
@@ -218,45 +159,30 @@
 			}
 		}
 
-	if (!BN_copy(&dest->order, &src->order)) return 0;
-	if (!BN_copy(&dest->cofactor, &src->cofactor)) return 0;
+	if (dest->precomp != NULL)
+		ec_pre_comp_free(dest->precomp);
 
-	dest->curve_name = src->curve_name;
-	dest->asn1_flag  = src->asn1_flag;
-	dest->asn1_form  = src->asn1_form;
-
-	if (src->seed)
+	dest->precomp = NULL;
+	if (src->precomp != NULL)
 		{
-		if (dest->seed)
-			OPENSSL_free(dest->seed);
-		dest->seed = OPENSSL_malloc(src->seed_len);
-		if (dest->seed == NULL)
-			return 0;
-		if (!memcpy(dest->seed, src->seed, src->seed_len))
-			return 0;
-		dest->seed_len = src->seed_len;
+		dest->precomp = ec_pre_comp_dup(src->precomp);
 		}
-	else
-		{
-		if (dest->seed)
-			OPENSSL_free(dest->seed);
-		dest->seed = NULL;
-		dest->seed_len = 0;
-		}
-	
 
-	return dest->meth->group_copy(dest, src);
+	if (!BN_copy(&dest->order, &src->order)) return 0;
+	if (!BN_copy(&dest->cofactor, &src->cofactor)) return 0;
+
+	return ec_GFp_mont_group_copy(dest, src);
 	}
 
 
-EC_GROUP *EC_GROUP_dup(const EC_GROUP *a)
+static EC_GROUP *EC_GROUP_dup(const EC_GROUP *a)
 	{
 	EC_GROUP *t = NULL;
 	int ok = 0;
 
 	if (a == NULL) return NULL;
 
-	if ((t = EC_GROUP_new(a->meth)) == NULL) return(NULL);
+	if ((t = EC_GROUP_new((EC_METHOD *)(void*)2)) == NULL) return(NULL);
 	if (!EC_GROUP_copy(t, a)) goto err;
 
 	ok = 1;
@@ -271,19 +197,7 @@
 	}
 
 
-const EC_METHOD *EC_GROUP_method_of(const EC_GROUP *group)
-	{
-	return group->meth;
-	}
-
-
-int EC_METHOD_get_field_type(const EC_METHOD *meth)
-        {
-        return meth->field_type;
-        }
-
-
-int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator, const BIGNUM *order, const BIGNUM *cofactor)
+static int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator, const BIGNUM *order, const BIGNUM *cofactor)
 	{
 	if (generator == NULL)
 		{
@@ -312,13 +226,13 @@
 	}
 
 
-const EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *group)
+static const EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *group)
 	{
 	return group->generator;
 	}
 
 
-int EC_GROUP_get_order(const EC_GROUP *group, BIGNUM *order, BN_CTX *ctx)
+static int EC_GROUP_get_order(const EC_GROUP *group, BIGNUM *order, BN_CTX *ctx)
 	{
 	if (!BN_copy(order, &group->order))
 		return 0;
@@ -327,372 +241,15 @@
 	}
 
 
-int EC_GROUP_get_cofactor(const EC_GROUP *group, BIGNUM *cofactor, BN_CTX *ctx)
-	{
-	if (!BN_copy(cofactor, &group->cofactor))
-		return 0;
-
-	return !BN_is_zero(&group->cofactor);
-	}
-
-
-void EC_GROUP_set_curve_name(EC_GROUP *group, int nid)
-	{
-	group->curve_name = nid;
-	}
-
-
-int EC_GROUP_get_curve_name(const EC_GROUP *group)
-	{
-	return group->curve_name;
-	}
-
-
-void EC_GROUP_set_asn1_flag(EC_GROUP *group, int flag)
-	{
-	group->asn1_flag = flag;
-	}
-
-
-int EC_GROUP_get_asn1_flag(const EC_GROUP *group)
-	{
-	return group->asn1_flag;
-	}
-
-
-void EC_GROUP_set_point_conversion_form(EC_GROUP *group, 
-                                        point_conversion_form_t form)
-	{
-	group->asn1_form = form;
-	}
-
-
-point_conversion_form_t EC_GROUP_get_point_conversion_form(const EC_GROUP *group)
-	{
-	return group->asn1_form;
-	}
-
-
-size_t EC_GROUP_set_seed(EC_GROUP *group, const unsigned char *p, size_t len)
-	{
-	if (group->seed)
-		{
-		OPENSSL_free(group->seed);
-		group->seed = NULL;
-		group->seed_len = 0;
-		}
-
-	if (!len || !p)
-		return 1;
-
-	if ((group->seed = OPENSSL_malloc(len)) == NULL)
-		return 0;
-	memcpy(group->seed, p, len);
-	group->seed_len = len;
-
-	return len;
-	}
-
-
-unsigned char *EC_GROUP_get0_seed(const EC_GROUP *group)
-	{
-	return group->seed;
-	}
-
-
-size_t EC_GROUP_get_seed_len(const EC_GROUP *group)
+static int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
 	{
-	return group->seed_len;
-	}
-
-
-int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-	{
-	if (group->meth->group_set_curve == 0)
-		{
-		ECerr(EC_F_EC_GROUP_SET_CURVE_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	return group->meth->group_set_curve(group, p, a, b, ctx);
-	}
-
-
-int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
-	{
-	if (group->meth->group_get_curve == 0)
-		{
-		ECerr(EC_F_EC_GROUP_GET_CURVE_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	return group->meth->group_get_curve(group, p, a, b, ctx);
-	}
-
-
-int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-	{
-	if (group->meth->group_set_curve == 0)
-		{
-		ECerr(EC_F_EC_GROUP_SET_CURVE_GF2M, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	return group->meth->group_set_curve(group, p, a, b, ctx);
-	}
-
-
-int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
-	{
-	if (group->meth->group_get_curve == 0)
-		{
-		ECerr(EC_F_EC_GROUP_GET_CURVE_GF2M, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	return group->meth->group_get_curve(group, p, a, b, ctx);
-	}
-
-
-int EC_GROUP_get_degree(const EC_GROUP *group)
-	{
-	if (group->meth->group_get_degree == 0)
-		{
-		ECerr(EC_F_EC_GROUP_GET_DEGREE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	return group->meth->group_get_degree(group);
-	}
-
-
-int EC_GROUP_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)
-	{
-	if (group->meth->group_check_discriminant == 0)
-		{
-		ECerr(EC_F_EC_GROUP_CHECK_DISCRIMINANT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	return group->meth->group_check_discriminant(group, ctx);
-	}
-
-
-int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx)
-	{
-	int    r = 0;
-	BIGNUM *a1, *a2, *a3, *b1, *b2, *b3;
-	BN_CTX *ctx_new = NULL;
-
-	/* compare the field types*/
-	if (EC_METHOD_get_field_type(EC_GROUP_method_of(a)) !=
-	    EC_METHOD_get_field_type(EC_GROUP_method_of(b)))
-		return 1;
-	/* compare the curve name (if present) */
-	if (EC_GROUP_get_curve_name(a) && EC_GROUP_get_curve_name(b) &&
-	    EC_GROUP_get_curve_name(a) == EC_GROUP_get_curve_name(b))
-		return 0;
-
-	if (!ctx)
-		ctx_new = ctx = BN_CTX_new();
-	if (!ctx)
-		return -1;
-	
-	BN_CTX_start(ctx);
-	a1 = BN_CTX_get(ctx);
-	a2 = BN_CTX_get(ctx);
-	a3 = BN_CTX_get(ctx);
-	b1 = BN_CTX_get(ctx);
-	b2 = BN_CTX_get(ctx);
-	b3 = BN_CTX_get(ctx);
-	if (!b3)
-		{
-		BN_CTX_end(ctx);
-		if (ctx_new)
-			BN_CTX_free(ctx);
-		return -1;
-		}
-
-	/* XXX This approach assumes that the external representation
-	 * of curves over the same field type is the same.
-	 */
-	if (!a->meth->group_get_curve(a, a1, a2, a3, ctx) ||
-	    !b->meth->group_get_curve(b, b1, b2, b3, ctx))
-		r = 1;
-
-	if (r || BN_cmp(a1, b1) || BN_cmp(a2, b2) || BN_cmp(a3, b3))
-		r = 1;
-
-	/* XXX EC_POINT_cmp() assumes that the methods are equal */
-	if (r || EC_POINT_cmp(a, EC_GROUP_get0_generator(a),
-	    EC_GROUP_get0_generator(b), ctx))
-		r = 1;
-
-	if (!r)
-		{
-		/* compare the order and cofactor */
-		if (!EC_GROUP_get_order(a, a1, ctx) ||
-		    !EC_GROUP_get_order(b, b1, ctx) ||
-		    !EC_GROUP_get_cofactor(a, a2, ctx) ||
-		    !EC_GROUP_get_cofactor(b, b2, ctx))
-			{
-			BN_CTX_end(ctx);
-			if (ctx_new)
-				BN_CTX_free(ctx);
-			return -1;
-			}
-		if (BN_cmp(a1, b1) || BN_cmp(a2, b2))
-			r = 1;
-		}
-
-	BN_CTX_end(ctx);
-	if (ctx_new)
-		BN_CTX_free(ctx);
-
-	return r;
-	}
-
-
-/* this has 'package' visibility */
-int EC_EX_DATA_set_data(EC_EXTRA_DATA **ex_data, void *data,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *))
-	{
-	EC_EXTRA_DATA *d;
-
-	if (ex_data == NULL)
-		return 0;
-
-	for (d = *ex_data; d != NULL; d = d->next)
-		{
-		if (d->dup_func == dup_func && d->free_func == free_func && d->clear_free_func == clear_free_func)
-			{
-			ECerr(EC_F_EC_EX_DATA_SET_DATA, EC_R_SLOT_FULL);
-			return 0;
-			}
-		}
-
-	if (data == NULL)
-		/* no explicit entry needed */
-		return 1;
-
-	d = OPENSSL_malloc(sizeof *d);
-	if (d == NULL)
-		return 0;
-
-	d->data = data;
-	d->dup_func = dup_func;
-	d->free_func = free_func;
-	d->clear_free_func = clear_free_func;
-
-	d->next = *ex_data;
-	*ex_data = d;
-
-	return 1;
-	}
-
-/* this has 'package' visibility */
-void *EC_EX_DATA_get_data(const EC_EXTRA_DATA *ex_data,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *))
-	{
-	const EC_EXTRA_DATA *d;
-
-	for (d = ex_data; d != NULL; d = d->next)
-		{
-		if (d->dup_func == dup_func && d->free_func == free_func && d->clear_free_func == clear_free_func)
-			return d->data;
-		}
-	
-	return NULL;
-	}
-
-/* this has 'package' visibility */
-void EC_EX_DATA_free_data(EC_EXTRA_DATA **ex_data,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *))
-	{
-	EC_EXTRA_DATA **p;
-
-	if (ex_data == NULL)
-		return;
-
-	for (p = ex_data; *p != NULL; p = &((*p)->next))
-		{
-		if ((*p)->dup_func == dup_func && (*p)->free_func == free_func && (*p)->clear_free_func == clear_free_func)
-			{
-			EC_EXTRA_DATA *next = (*p)->next;
-
-			(*p)->free_func((*p)->data);
-			OPENSSL_free(*p);
-			
-			*p = next;
-			return;
-			}
-		}
-	}
-
-/* this has 'package' visibility */
-void EC_EX_DATA_clear_free_data(EC_EXTRA_DATA **ex_data,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *))
-	{
-	EC_EXTRA_DATA **p;
-
-	if (ex_data == NULL)
-		return;
-
-	for (p = ex_data; *p != NULL; p = &((*p)->next))
-		{
-		if ((*p)->dup_func == dup_func && (*p)->free_func == free_func && (*p)->clear_free_func == clear_free_func)
-			{
-			EC_EXTRA_DATA *next = (*p)->next;
-
-			(*p)->clear_free_func((*p)->data);
-			OPENSSL_free(*p);
-			
-			*p = next;
-			return;
-			}
-		}
-	}
-
-/* this has 'package' visibility */
-void EC_EX_DATA_free_all_data(EC_EXTRA_DATA **ex_data)
-	{
-	EC_EXTRA_DATA *d;
-
-	if (ex_data == NULL)
-		return;
-
-	d = *ex_data;
-	while (d)
-		{
-		EC_EXTRA_DATA *next = d->next;
-		
-		d->free_func(d->data);
-		OPENSSL_free(d);
-		
-		d = next;
-		}
-	*ex_data = NULL;
-	}
-
-/* this has 'package' visibility */
-void EC_EX_DATA_clear_free_all_data(EC_EXTRA_DATA **ex_data)
-	{
-	EC_EXTRA_DATA *d;
-
-	if (ex_data == NULL)
-		return;
-
-	d = *ex_data;
-	while (d)
-		{
-		EC_EXTRA_DATA *next = d->next;
-		
-		d->clear_free_func(d->data);
-		OPENSSL_free(d);
-		
-		d = next;
-		}
-	*ex_data = NULL;
+	return ec_GFp_mont_group_set_curve(group, p, a, b, ctx);
 	}
 
 
 /* functions for EC_POINT objects */
 
-EC_POINT *EC_POINT_new(const EC_GROUP *group)
+static EC_POINT *EC_POINT_new(const EC_GROUP *group)
 	{
 	EC_POINT *ret;
 
@@ -701,11 +258,6 @@
 		ECerr(EC_F_EC_POINT_NEW, ERR_R_PASSED_NULL_PARAMETER);
 		return NULL;
 		}
-	if (group->meth->point_init == 0)
-		{
-		ECerr(EC_F_EC_POINT_NEW, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return NULL;
-		}
 
 	ret = OPENSSL_malloc(sizeof *ret);
 	if (ret == NULL)
@@ -714,9 +266,7 @@
 		return NULL;
 		}
 
-	ret->meth = group->meth;
-	
-	if (!ret->meth->point_init(ret))
+	if (!ec_GFp_simple_point_init(ret))
 		{
 		OPENSSL_free(ret);
 		return NULL;
@@ -726,48 +276,34 @@
 	}
 
 
-void EC_POINT_free(EC_POINT *point)
+static void EC_POINT_free(EC_POINT *point)
 	{
 	if (!point) return;
 
-	if (point->meth->point_finish != 0)
-		point->meth->point_finish(point);
+		ec_GFp_simple_point_finish(point);
 	OPENSSL_free(point);
 	}
  
 
-void EC_POINT_clear_free(EC_POINT *point)
+static void EC_POINT_clear_free(EC_POINT *point)
 	{
 	if (!point) return;
 
-	if (point->meth->point_clear_finish != 0)
-		point->meth->point_clear_finish(point);
-	else if (point->meth != NULL && point->meth->point_finish != 0)
-		point->meth->point_finish(point);
+		ec_GFp_simple_point_clear_finish(point);
 	OPENSSL_cleanse(point, sizeof *point);
 	OPENSSL_free(point);
 	}
 
 
-int EC_POINT_copy(EC_POINT *dest, const EC_POINT *src)
+static int EC_POINT_copy(EC_POINT *dest, const EC_POINT *src)
 	{
-	if (dest->meth->point_copy == 0)
-		{
-		ECerr(EC_F_EC_POINT_COPY, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (dest->meth != src->meth)
-		{
-		ECerr(EC_F_EC_POINT_COPY, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
 	if (dest == src)
 		return 1;
-	return dest->meth->point_copy(dest, src);
+	return ec_GFp_simple_point_copy(dest, src);
 	}
 
 
-EC_POINT *EC_POINT_dup(const EC_POINT *a, const EC_GROUP *group)
+static EC_POINT *EC_POINT_dup(const EC_POINT *a, const EC_GROUP *group)
 	{
 	EC_POINT *t;
 	int r;
@@ -786,328 +322,57 @@
 	}
 
 
-const EC_METHOD *EC_POINT_method_of(const EC_POINT *point)
-	{
-	return point->meth;
-	}
-
-
-int EC_POINT_set_to_infinity(const EC_GROUP *group, EC_POINT *point)
+static int EC_POINT_set_to_infinity(const EC_GROUP *group, EC_POINT *point)
 	{
-	if (group->meth->point_set_to_infinity == 0)
-		{
-		ECerr(EC_F_EC_POINT_SET_TO_INFINITY, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_SET_TO_INFINITY, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->point_set_to_infinity(group, point);
+	return ec_GFp_simple_point_set_to_infinity(group, point);
 	}
 
 
-int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
-	const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx)
-	{
-	if (group->meth->point_set_Jprojective_coordinates_GFp == 0)
-		{
-		ECerr(EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->point_set_Jprojective_coordinates_GFp(group, point, x, y, z, ctx);
-	}
-
-
-int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group, const EC_POINT *point,
-	BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *ctx)
-	{
-	if (group->meth->point_get_Jprojective_coordinates_GFp == 0)
-		{
-		ECerr(EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->point_get_Jprojective_coordinates_GFp(group, point, x, y, z, ctx);
-	}
-
-
-int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
+static int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
 	const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx)
 	{
-	if (group->meth->point_set_affine_coordinates == 0)
-		{
-		ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->point_set_affine_coordinates(group, point, x, y, ctx);
+	return ec_GFp_simple_point_set_affine_coordinates(group, point, x, y, ctx);
 	}
 
-
-int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, EC_POINT *point,
-	const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx)
-	{
-	if (group->meth->point_set_affine_coordinates == 0)
-		{
-		ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->point_set_affine_coordinates(group, point, x, y, ctx);
-	}
-
-
-int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, const EC_POINT *point,
+static int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, const EC_POINT *point,
 	BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
 	{
-	if (group->meth->point_get_affine_coordinates == 0)
-		{
-		ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->point_get_affine_coordinates(group, point, x, y, ctx);
-	}
-
-
-int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group, const EC_POINT *point,
-	BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
-	{
-	if (group->meth->point_get_affine_coordinates == 0)
-		{
-		ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->point_get_affine_coordinates(group, point, x, y, ctx);
-	}
-
-
-int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
-	const BIGNUM *x, int y_bit, BN_CTX *ctx)
-	{
-	if (group->meth->point_set_compressed_coordinates == 0)
-		{
-		ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
-	}
-
-
-int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group, EC_POINT *point,
-	const BIGNUM *x, int y_bit, BN_CTX *ctx)
-	{
-	if (group->meth->point_set_compressed_coordinates == 0)
-		{
-		ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
+	return ec_GFp_simple_point_get_affine_coordinates(group, point, x, y, ctx);
 	}
 
-
-size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
-        unsigned char *buf, size_t len, BN_CTX *ctx)
+static int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
 	{
-	if (group->meth->point2oct == 0)
-		{
-		ECerr(EC_F_EC_POINT_POINT2OCT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_POINT2OCT, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->point2oct(group, point, form, buf, len, ctx);
+	return ec_GFp_simple_add(group, r, a, b, ctx);
 	}
 
 
-int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point,
-        const unsigned char *buf, size_t len, BN_CTX *ctx)
+static int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *ctx)
 	{
-	if (group->meth->oct2point == 0)
-		{
-		ECerr(EC_F_EC_POINT_OCT2POINT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_OCT2POINT, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->oct2point(group, point, buf, len, ctx);
+	return ec_GFp_simple_dbl(group, r, a, ctx);
 	}
 
 
-int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
+static int EC_POINT_invert(const EC_GROUP *group, EC_POINT *a, BN_CTX *ctx)
 	{
-	if (group->meth->add == 0)
-		{
-		ECerr(EC_F_EC_POINT_ADD, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if ((group->meth != r->meth) || (r->meth != a->meth) || (a->meth != b->meth))
-		{
-		ECerr(EC_F_EC_POINT_ADD, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->add(group, r, a, b, ctx);
+	return ec_GFp_simple_invert(group, a, ctx);
 	}
 
 
-int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *ctx)
+static int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)
 	{
-	if (group->meth->dbl == 0)
-		{
-		ECerr(EC_F_EC_POINT_DBL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if ((group->meth != r->meth) || (r->meth != a->meth))
-		{
-		ECerr(EC_F_EC_POINT_DBL, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->dbl(group, r, a, ctx);
+	return ec_GFp_simple_is_at_infinity(group, point);
 	}
 
 
-int EC_POINT_invert(const EC_GROUP *group, EC_POINT *a, BN_CTX *ctx)
+static int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
 	{
-	if (group->meth->dbl == 0)
-		{
-		ECerr(EC_F_EC_POINT_INVERT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != a->meth)
-		{
-		ECerr(EC_F_EC_POINT_INVERT, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->invert(group, a, ctx);
+	return ec_GFp_simple_cmp(group, a, b, ctx);
 	}
 
 
-int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)
+static int EC_POINTs_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx)
 	{
-	if (group->meth->is_at_infinity == 0)
-		{
-		ECerr(EC_F_EC_POINT_IS_AT_INFINITY, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_IS_AT_INFINITY, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->is_at_infinity(group, point);
-	}
-
-
-int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_CTX *ctx)
-	{
-	if (group->meth->is_on_curve == 0)
-		{
-		ECerr(EC_F_EC_POINT_IS_ON_CURVE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_IS_ON_CURVE, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->is_on_curve(group, point, ctx);
-	}
-
-
-int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
-	{
-	if (group->meth->point_cmp == 0)
-		{
-		ECerr(EC_F_EC_POINT_CMP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if ((group->meth != a->meth) || (a->meth != b->meth))
-		{
-		ECerr(EC_F_EC_POINT_CMP, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->point_cmp(group, a, b, ctx);
-	}
-
-
-int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
-	{
-	if (group->meth->make_affine == 0)
-		{
-		ECerr(EC_F_EC_POINT_MAKE_AFFINE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (group->meth != point->meth)
-		{
-		ECerr(EC_F_EC_POINT_MAKE_AFFINE, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-	return group->meth->make_affine(group, point, ctx);
-	}
-
-
-int EC_POINTs_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx)
-	{
-	size_t i;
-
-	if (group->meth->points_make_affine == 0)
-		{
-		ECerr(EC_F_EC_POINTS_MAKE_AFFINE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	for (i = 0; i < num; i++)
-		{
-		if (group->meth != points[i]->meth)
-			{
-			ECerr(EC_F_EC_POINTS_MAKE_AFFINE, EC_R_INCOMPATIBLE_OBJECTS);
-			return 0;
-			}
-		}
-	return group->meth->points_make_affine(group, num, points, ctx);
+	return ec_GFp_simple_points_make_affine(group, num, points, ctx);
 	}
 
 
@@ -1117,17 +382,14 @@
  * otherwise we dispatch through methods.
  */
 
-int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
+static int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 	size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *ctx)
 	{
-	if (group->meth->mul == 0)
 		/* use default */
 		return ec_wNAF_mul(group, r, scalar, num, points, scalars, ctx);
-
-	return group->meth->mul(group, r, scalar, num, points, scalars, ctx);
 	}
 
-int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *g_scalar,
+static int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *g_scalar,
 	const EC_POINT *point, const BIGNUM *p_scalar, BN_CTX *ctx)
 	{
 	/* just a convenient interface to EC_POINTs_mul() */
@@ -1141,29 +403,8 @@
 	return EC_POINTs_mul(group, r, g_scalar, (point != NULL && p_scalar != NULL), points, scalars, ctx);
 	}
 
-int EC_GROUP_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
+static int EC_GROUP_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
 	{
-	if (group->meth->mul == 0)
 		/* use default */
 		return ec_wNAF_precompute_mult(group, ctx);
-
-	if (group->meth->precompute_mult != 0)
-		return group->meth->precompute_mult(group, ctx);
-	else
-		return 1; /* nothing to do, so report success */
-	}
-
-int EC_GROUP_have_precompute_mult(const EC_GROUP *group)
-	{
-	if (group->meth->mul == 0)
-		/* use default */
-		return ec_wNAF_have_precompute_mult(group);
-
-	if (group->meth->have_precompute_mult != 0)
-		return group->meth->have_precompute_mult(group);
-	else
-		return 0; /* cannot tell whether precomputation has been performed */
 	}
-
-#endif
-

makemkv-oss-1.8.7.tar.gz/libabi/pssl/ec_mult.c -> makemkv-oss-1.8.8.tar.gz/libabi/pssl/ec_mult.c Changed

@@ -3,7 +3,7 @@
  * Originally written by Bodo Moeller and Nils Larsch for the OpenSSL project.
  */
 /* ====================================================================
- * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -63,12 +63,8 @@
 
 #include <string.h>
 
-#include <openssl/err.h>
-
 #include "ec_lcl.h"
 
-#ifndef SKIP_PRIVATE_OSSL
-
 /*
  * This file implements the wNAF-based interleaving multi-exponentation method
  * (<URL:http://www.informatik.tu-darmstadt.de/TI/Mitarbeiter/moeller.html#multiexp>);
@@ -80,7 +76,7 @@
 
 
 /* structure for precomputed multiples of the generator */
-typedef struct ec_pre_comp_st {
+struct ec_pre_comp_st {
 	const EC_GROUP *group; /* parent EC_GROUP object */
 	size_t blocksize;      /* block size for wNAF splitting */
 	size_t numblocks;      /* max. number of blocks for which we have precomputation */
@@ -89,12 +85,8 @@
 	                        * 'num' pointers to EC_POINT objects followed by a NULL */
 	size_t num;            /* numblocks * 2^(w-1) */
 	int references;
-} EC_PRE_COMP;
- 
-/* functions to manage EC_PRE_COMP within the EC_GROUP extra_data framework */
-static void *ec_pre_comp_dup(void *);
-static void ec_pre_comp_free(void *);
-static void ec_pre_comp_clear_free(void *);
+};
+
 
 static EC_PRE_COMP *ec_pre_comp_new(const EC_GROUP *group)
 	{
@@ -105,7 +97,10 @@
 
 	ret = (EC_PRE_COMP *)OPENSSL_malloc(sizeof(EC_PRE_COMP));
 	if (!ret)
+		{
+		ECerr(EC_F_EC_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE);
 		return ret;
+		}
 	ret->group = group;
 	ret->blocksize = 8; /* default */
 	ret->numblocks = 0;
@@ -116,21 +111,18 @@
 	return ret;
 	}
 
-static void *ec_pre_comp_dup(void *src_)
+static EC_PRE_COMP *ec_pre_comp_dup(EC_PRE_COMP *src)
 	{
-	EC_PRE_COMP *src = src_;
-
 	/* no need to actually copy, these objects never change! */
 
 	CRYPTO_add(&src->references, 1, CRYPTO_LOCK_EC_PRE_COMP);
 
-	return src_;
+	return src;
 	}
 
-static void ec_pre_comp_free(void *pre_)
+static void ec_pre_comp_free(EC_PRE_COMP *pre)
 	{
 	int i;
-	EC_PRE_COMP *pre = pre_;
 
 	if (!pre)
 		return;
@@ -150,10 +142,9 @@
 	OPENSSL_free(pre);
 	}
 
-static void ec_pre_comp_clear_free(void *pre_)
+static void ec_pre_comp_clear_free(EC_PRE_COMP *pre)
 	{
 	int i;
-	EC_PRE_COMP *pre = pre_;
 
 	if (!pre)
 		return;
@@ -167,11 +158,13 @@
 		EC_POINT **p;
 
 		for (p = pre->points; *p != NULL; p++)
+			{
 			EC_POINT_clear_free(*p);
-		OPENSSL_cleanse(pre->points, sizeof pre->points);
+			OPENSSL_cleanse(p, sizeof *p);
+			}
 		OPENSSL_free(pre->points);
 		}
-	OPENSSL_cleanse(pre, sizeof pre);
+	OPENSSL_cleanse(pre, sizeof *pre);
 	OPENSSL_free(pre);
 	}
 
@@ -195,6 +188,19 @@
 	int bit, next_bit, mask;
 	size_t len = 0, j;
 	
+	if (BN_is_zero(scalar))
+		{
+		r = OPENSSL_malloc(1);
+		if (!r)
+			{
+			ECerr(EC_F_COMPUTE_WNAF, ERR_R_MALLOC_FAILURE);
+			goto err;
+			}
+		r[0] = 0;
+		*ret_len = 1;
+		return r;
+		}
+		
 	if (w <= 0 || w > 7) /* 'signed char' can represent integers with absolute values less than 2^7 */
 		{
 		ECerr(EC_F_COMPUTE_WNAF, ERR_R_INTERNAL_ERROR);
@@ -209,15 +215,19 @@
 		sign = -1;
 		}
 
+	if (scalar->d == NULL || scalar->top == 0)
+		{
+		ECerr(EC_F_COMPUTE_WNAF, ERR_R_INTERNAL_ERROR);
+		goto err;
+		}
+
 	len = BN_num_bits(scalar);
 	r = OPENSSL_malloc(len + 1); /* modified wNAF may be one digit longer than binary representation
 	                              * (*ret_len will be set to the actual length, i.e. at most
 	                              * BN_num_bits(scalar) + 1) */
-	if (r == NULL) goto err;
-
-	if (scalar->d == NULL || scalar->top == 0)
+	if (r == NULL)
 		{
-		ECerr(EC_F_COMPUTE_WNAF, ERR_R_INTERNAL_ERROR);
+		ECerr(EC_F_COMPUTE_WNAF, ERR_R_MALLOC_FAILURE);
 		goto err;
 		}
 	window_val = scalar->d[0] & mask;
@@ -322,7 +332,7 @@
  *      scalar*generator
  * in the addition if scalar != NULL
  */
-int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
+static int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 	size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *ctx)
 	{
 	BN_CTX *new_ctx = NULL;
@@ -348,26 +358,11 @@
 	                     * i.e. precomputation is not available */
 	int ret = 0;
 	
-	if (group->meth != r->meth)
-		{
-		ECerr(EC_F_EC_WNAF_MUL, EC_R_INCOMPATIBLE_OBJECTS);
-		return 0;
-		}
-
 	if ((scalar == NULL) && (num == 0))
 		{
 		return EC_POINT_set_to_infinity(group, r);
 		}
 
-	for (i = 0; i < num; i++)
-		{
-		if (group->meth != points[i]->meth)
-			{
-			ECerr(EC_F_EC_WNAF_MUL, EC_R_INCOMPATIBLE_OBJECTS);
-			return 0;
-			}
-		}
-
 	if (ctx == NULL)
 		{
 		ctx = new_ctx = BN_CTX_new();
@@ -386,7 +381,7 @@
 		
 		/* look if we can use precomputed multiples of generator */
 
-		pre_comp = EC_EX_DATA_get_data(group->extra_data, ec_pre_comp_dup, ec_pre_comp_free, ec_pre_comp_clear_free);
+		pre_comp = group->precomp;
 
 		if (pre_comp && pre_comp->numblocks && (EC_POINT_cmp(group, generator, pre_comp->points[0], ctx) == 0))
 			{
@@ -400,7 +395,7 @@
 			if (numblocks > pre_comp->numblocks)
 				numblocks = pre_comp->numblocks;
 
-			pre_points_per_block = 1u << (pre_comp->w - 1);
+			pre_points_per_block = (size_t)1 << (pre_comp->w - 1);
 
 			/* check that pre_comp looks sane */
 			if (pre_comp->num != (pre_comp->numblocks * pre_points_per_block))
@@ -426,7 +421,10 @@
 	val_sub  = OPENSSL_malloc(totalnum * sizeof val_sub[0]);
 		 
 	if (!wsize || !wNAF_len || !wNAF || !val_sub)
+		{
+		ECerr(EC_F_EC_WNAF_MUL, ERR_R_MALLOC_FAILURE);
 		goto err;
+		}
 
 	wNAF[0] = NULL;	/* preliminary pivot */
 
@@ -439,7 +437,7 @@
 
 		bits = i < num ? BN_num_bits(scalars[i]) : BN_num_bits(scalar);
 		wsize[i] = EC_window_bits_for_scalar_size(bits);
-		num_val += 1u << (wsize[i] - 1);
+		num_val += (size_t)1 << (wsize[i] - 1);
 		wNAF[i + 1] = NULL; /* make sure we always have a pivot */
 		wNAF[i] = compute_wNAF((i < num ? scalars[i] : scalar), wsize[i], &wNAF_len[i]);
 		if (wNAF[i] == NULL)
@@ -539,6 +537,7 @@
 					wNAF[i] = OPENSSL_malloc(wNAF_len[i]);
 					if (wNAF[i] == NULL)
 						{
+						ECerr(EC_F_EC_WNAF_MUL, ERR_R_MALLOC_FAILURE);
 						OPENSSL_free(tmp_wNAF);
 						goto err;
 						}
@@ -565,7 +564,11 @@
 	 * 'val_sub[i]' is a pointer to the subarray for the i-th point,
 	 * or to a subarray of 'pre_comp->points' if we already have precomputation. */
 	val = OPENSSL_malloc((num_val + 1) * sizeof val[0]);
-	if (val == NULL) goto err;
+	if (val == NULL)
+		{
+		ECerr(EC_F_EC_WNAF_MUL, ERR_R_MALLOC_FAILURE);
+		goto err;
+		}
 	val[num_val] = NULL; /* pivot element */
 
 	/* allocate points for precomputation */
@@ -573,7 +576,7 @@
 	for (i = 0; i < num + num_scalar; i++)
 		{
 		val_sub[i] = v;
-		for (j = 0; j < (1u << (wsize[i] - 1)); j++)
+		for (j = 0; j < ((size_t)1 << (wsize[i] - 1)); j++)
 			{
 			*v = EC_POINT_new(group);
 			if (*v == NULL) goto err;
@@ -609,7 +612,7 @@
 		if (wsize[i] > 1)
 			{
 			if (!EC_POINT_dbl(group, tmp, val_sub[i][0], ctx)) goto err;
-			for (j = 1; j < (1u << (wsize[i] - 1)); j++)
+			for (j = 1; j < ((size_t)1 << (wsize[i] - 1)); j++)
 				{
 				if (!EC_POINT_add(group, val_sub[i][j], val_sub[i][j - 1], tmp, ctx)) goto err;
 				}
@@ -733,7 +736,7 @@
  * points[2^(w-1)*numblocks-1]     = (2^(w-1)) *  2^(blocksize*(numblocks-1)) * generator
  * points[2^(w-1)*numblocks]       = NULL
  */
-int ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
+static int ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
 	{
 	const EC_POINT *generator;
 	EC_POINT *tmp_point = NULL, *base = NULL, **var;
@@ -745,7 +748,7 @@
 	int ret = 0;
 
 	/* if there is an old EC_PRE_COMP object, throw it away */
-	EC_EX_DATA_free_data(&group->extra_data, ec_pre_comp_dup, ec_pre_comp_free, ec_pre_comp_clear_free);
+	ec_pre_comp_free(group->precomp); group->precomp=NULL;
 
 	if ((pre_comp = ec_pre_comp_new(group)) == NULL)
 		return 0;
@@ -793,7 +796,7 @@
 
 	numblocks = (bits + blocksize - 1) / blocksize; /* max. number of blocks to use for wNAF splitting */
 	
-	pre_points_per_block = 1u << (w - 1);
+	pre_points_per_block = (size_t)1 << (w - 1);
 	num = pre_points_per_block * numblocks; /* number of points to compute and store */
 
 	points = OPENSSL_malloc(sizeof (EC_POINT*)*(num + 1));
@@ -873,9 +876,7 @@
 	points = NULL;
 	pre_comp->num = num;
 
-	if (!EC_EX_DATA_set_data(&group->extra_data, pre_comp,
-		ec_pre_comp_dup, ec_pre_comp_free, ec_pre_comp_clear_free))
-		goto err;
+	group->precomp = pre_comp;
 	pre_comp = NULL;
 
 	ret = 1;
@@ -901,14 +902,3 @@
 	return ret;
 	}
 
-
-int ec_wNAF_have_precompute_mult(const EC_GROUP *group)
-	{
-	if (EC_EX_DATA_get_data(group->extra_data, ec_pre_comp_dup, ec_pre_comp_free, ec_pre_comp_clear_free) != NULL)
-		return 1;
-	else
-		return 0;
-	}
-
-#endif
-

makemkv-oss-1.8.8.tar.gz/libabi/pssl/ecdsa.h Added

@@ -0,0 +1,150 @@
+/* crypto/ecdsa/ecdsa.h */
+/**
+ * \file   crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions
+ * \author Written by Nils Larsch for the OpenSSL project
+ */
+/* ====================================================================
+ * Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT 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.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+#ifndef HEADER_ECDSA_H
+#define HEADER_ECDSA_H
+
+#include <openssl/opensslconf.h>
+
+#include "ec.h"
+#include <openssl/ossl_typ.h>
+#include <openssl/bn.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct ECDSA_SIG_st
+	{
+	BIGNUM *r;
+	BIGNUM *s;
+	} ECDSA_SIG;
+
+/** Allocates and initialize a ECDSA_SIG structure
+ *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
+ */
+static ECDSA_SIG *ECDSA_SIG_new(void);
+
+/** frees a ECDSA_SIG structure
+ *  \param  sig  pointer to the ECDSA_SIG structure
+ */
+static void	  ECDSA_SIG_free(ECDSA_SIG *sig);
+
+/** Computes ECDSA signature of a given hash value using the supplied
+ *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
+ *  \param  dgst     pointer to the hash value to sign
+ *  \param  dgstlen  length of the hash value
+ *  \param  kinv     BIGNUM with a pre-computed inverse k (optional)
+ *  \param  rp       BIGNUM with a pre-computed rp value (optioanl), 
+ *                   see ECDSA_sign_setup
+ *  \param  eckey    EC_KEY object containing a private EC key
+ *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
+ */
+static ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen, 
+		const BIGNUM *kinv, const BIGNUM *rp, EC_KEY *eckey);
+
+/** Verifies that the supplied signature is a valid ECDSA
+ *  signature of the supplied hash value using the supplied public key.
+ *  \param  dgst      pointer to the hash value
+ *  \param  dgst_len  length of the hash value
+ *  \param  sig       ECDSA_SIG structure
+ *  \param  eckey     EC_KEY object containing a public EC key
+ *  \return 1 if the signature is valid, 0 if the signature is invalid
+ *          and -1 on error
+ */
+static int	  ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
+		const ECDSA_SIG *sig, EC_KEY* eckey);
+
+/** Precompute parts of the signing operation
+ *  \param  eckey  EC_KEY object containing a private EC key
+ *  \param  ctx    BN_CTX object (optional)
+ *  \param  kinv   BIGNUM pointer for the inverse of k
+ *  \param  rp     BIGNUM pointer for x coordinate of k * generator
+ *  \return 1 on success and 0 otherwise
+ */
+static int 	  ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinv, 
+		BIGNUM **rp);
+
+/* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+
+/* Error codes for the ECDSA functions. */
+
+/* Function codes. */
+#define ECDSA_F_ECDSA_CHECK				 104
+#define ECDSA_F_ECDSA_DATA_NEW_METHOD			 100
+#define ECDSA_F_ECDSA_DO_SIGN				 101
+#define ECDSA_F_ECDSA_DO_VERIFY				 102
+#define ECDSA_F_ECDSA_SIGN_SETUP			 103
+
+/* Reason codes. */
+#define ECDSA_R_BAD_SIGNATURE				 100
+#define ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE		 101
+#define ECDSA_R_ERR_EC_LIB				 102
+#define ECDSA_R_MISSING_PARAMETERS			 103
+#define ECDSA_R_NEED_NEW_SETUP_VALUES			 106
+#define ECDSA_R_NON_FIPS_METHOD				 107
+#define ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED		 104
+#define ECDSA_R_SIGNATURE_MALLOC_FAILED			 105
+
+#ifdef  __cplusplus
+}
+#endif
+#endif

makemkv-oss-1.8.7.tar.gz/libabi/pssl/ecp_mont.c -> makemkv-oss-1.8.8.tar.gz/libabi/pssl/ecp_mont.c Changed

@@ -61,59 +61,14 @@
  * and contributed to the OpenSSL project.
  */
 
-#include <openssl/err.h>
-
 #include "ec_lcl.h"
 
-#ifndef SKIP_PRIVATE_OSSL
-
-const EC_METHOD *EC_GFp_mont_method(void)
+static const EC_METHOD *EC_GFp_mont_method(void)
 	{
-	static const EC_METHOD ret = {
-		NID_X9_62_prime_field,
-		ec_GFp_mont_group_init,
-		ec_GFp_mont_group_finish,
-		ec_GFp_mont_group_clear_finish,
-		ec_GFp_mont_group_copy,
-		ec_GFp_mont_group_set_curve,
-		ec_GFp_simple_group_get_curve,
-		ec_GFp_simple_group_get_degree,
-		ec_GFp_simple_group_check_discriminant,
-		ec_GFp_simple_point_init,
-		ec_GFp_simple_point_finish,
-		ec_GFp_simple_point_clear_finish,
-		ec_GFp_simple_point_copy,
-		ec_GFp_simple_point_set_to_infinity,
-		ec_GFp_simple_set_Jprojective_coordinates_GFp,
-		ec_GFp_simple_get_Jprojective_coordinates_GFp,
-		ec_GFp_simple_point_set_affine_coordinates,
-		ec_GFp_simple_point_get_affine_coordinates,
-		ec_GFp_simple_set_compressed_coordinates,
-		ec_GFp_simple_point2oct,
-		ec_GFp_simple_oct2point,
-		ec_GFp_simple_add,
-		ec_GFp_simple_dbl,
-		ec_GFp_simple_invert,
-		ec_GFp_simple_is_at_infinity,
-		ec_GFp_simple_is_on_curve,
-		ec_GFp_simple_cmp,
-		ec_GFp_simple_make_affine,
-		ec_GFp_simple_points_make_affine,
-		0 /* mul */,
-		0 /* precompute_mult */,
-		0 /* have_precompute_mult */,	
-		ec_GFp_mont_field_mul,
-		ec_GFp_mont_field_sqr,
-		0 /* field_div */,
-		ec_GFp_mont_field_encode,
-		ec_GFp_mont_field_decode,
-		ec_GFp_mont_field_set_to_one };
-
-	return &ret;
+	return (EC_METHOD *)(void*)1;
 	}
 
-
-int ec_GFp_mont_group_init(EC_GROUP *group)
+static int ec_GFp_mont_group_init(EC_GROUP *group)
 	{
 	int ok;
 
@@ -124,7 +79,7 @@
 	}
 
 
-void ec_GFp_mont_group_finish(EC_GROUP *group)
+static void ec_GFp_mont_group_finish(EC_GROUP *group)
 	{
 	if (group->field_data1 != NULL)
 		{
@@ -140,7 +95,7 @@
 	}
 
 
-void ec_GFp_mont_group_clear_finish(EC_GROUP *group)
+static void ec_GFp_mont_group_clear_finish(EC_GROUP *group)
 	{
 	if (group->field_data1 != NULL)
 		{
@@ -156,7 +111,7 @@
 	}
 
 
-int ec_GFp_mont_group_copy(EC_GROUP *dest, const EC_GROUP *src)
+static int ec_GFp_mont_group_copy(EC_GROUP *dest, const EC_GROUP *src)
 	{
 	if (dest->field_data1 != NULL)
 		{
@@ -195,7 +150,7 @@
 	}
 
 
-int ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+static int ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
 	{
 	BN_CTX *new_ctx = NULL;
 	BN_MONT_CTX *mont = NULL;
@@ -255,7 +210,7 @@
 	}
 
 
-int ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+static int ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
 	{
 	if (group->field_data1 == NULL)
 		{
@@ -267,7 +222,7 @@
 	}
 
 
-int ec_GFp_mont_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
+static int ec_GFp_mont_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
 	{
 	if (group->field_data1 == NULL)
 		{
@@ -279,7 +234,7 @@
 	}
 
 
-int ec_GFp_mont_field_encode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
+static int ec_GFp_mont_field_encode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
 	{
 	if (group->field_data1 == NULL)
 		{
@@ -291,7 +246,7 @@
 	}
 
 
-int ec_GFp_mont_field_decode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
+static int ec_GFp_mont_field_decode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
 	{
 	if (group->field_data1 == NULL)
 		{
@@ -303,7 +258,7 @@
 	}
 
 
-int ec_GFp_mont_field_set_to_one(const EC_GROUP *group, BIGNUM *r, BN_CTX *ctx)
+static int ec_GFp_mont_field_set_to_one(const EC_GROUP *group, BIGNUM *r, BN_CTX *ctx)
 	{
 	if (group->field_data2 == NULL)
 		{
@@ -314,6 +269,3 @@
 	if (!BN_copy(r, group->field_data2)) return 0;
 	return 1;
 	}
-
-#endif
-

makemkv-oss-1.8.7.tar.gz/libabi/pssl/ecp_smpl.c -> makemkv-oss-1.8.8.tar.gz/libabi/pssl/ecp_smpl.c Changed

@@ -62,59 +62,8 @@
  * and contributed to the OpenSSL project.
  */
 
-#include <openssl/err.h>
-#include <openssl/symhacks.h>
-
 #include "ec_lcl.h"
 
-#ifndef SKIP_PRIVATE_OSSL
-
-const EC_METHOD *EC_GFp_simple_method(void)
-	{
-	static const EC_METHOD ret = {
-		NID_X9_62_prime_field,
-		ec_GFp_simple_group_init,
-		ec_GFp_simple_group_finish,
-		ec_GFp_simple_group_clear_finish,
-		ec_GFp_simple_group_copy,
-		ec_GFp_simple_group_set_curve,
-		ec_GFp_simple_group_get_curve,
-		ec_GFp_simple_group_get_degree,
-		ec_GFp_simple_group_check_discriminant,
-		ec_GFp_simple_point_init,
-		ec_GFp_simple_point_finish,
-		ec_GFp_simple_point_clear_finish,
-		ec_GFp_simple_point_copy,
-		ec_GFp_simple_point_set_to_infinity,
-		ec_GFp_simple_set_Jprojective_coordinates_GFp,
-		ec_GFp_simple_get_Jprojective_coordinates_GFp,
-		ec_GFp_simple_point_set_affine_coordinates,
-		ec_GFp_simple_point_get_affine_coordinates,
-		ec_GFp_simple_set_compressed_coordinates,
-		ec_GFp_simple_point2oct,
-		ec_GFp_simple_oct2point,
-		ec_GFp_simple_add,
-		ec_GFp_simple_dbl,
-		ec_GFp_simple_invert,
-		ec_GFp_simple_is_at_infinity,
-		ec_GFp_simple_is_on_curve,
-		ec_GFp_simple_cmp,
-		ec_GFp_simple_make_affine,
-		ec_GFp_simple_points_make_affine,
-		0 /* mul */,
-		0 /* precompute_mult */,
-		0 /* have_precompute_mult */,	
-		ec_GFp_simple_field_mul,
-		ec_GFp_simple_field_sqr,
-		0 /* field_div */,
-		0 /* field_encode */,
-		0 /* field_decode */,
-		0 /* field_set_to_one */ };
-
-	return &ret;
-	}
-
-
 /* Most method functions in this file are designed to work with
  * non-trivial representations of field elements if necessary
  * (see ecp_mont.c): while standard modular addition and subtraction
@@ -129,7 +78,7 @@
  */
 
 
-int ec_GFp_simple_group_init(EC_GROUP *group)
+static int ec_GFp_simple_group_init(EC_GROUP *group)
 	{
 	BN_init(&group->field);
 	BN_init(&group->a);
@@ -139,7 +88,7 @@
 	}
 
 
-void ec_GFp_simple_group_finish(EC_GROUP *group)
+static void ec_GFp_simple_group_finish(EC_GROUP *group)
 	{
 	BN_free(&group->field);
 	BN_free(&group->a);
@@ -147,7 +96,7 @@
 	}
 
 
-void ec_GFp_simple_group_clear_finish(EC_GROUP *group)
+static void ec_GFp_simple_group_clear_finish(EC_GROUP *group)
 	{
 	BN_clear_free(&group->field);
 	BN_clear_free(&group->a);
@@ -155,7 +104,7 @@
 	}
 
 
-int ec_GFp_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
+static int ec_GFp_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
 	{
 	if (!BN_copy(&dest->field, &src->field)) return 0;
 	if (!BN_copy(&dest->a, &src->a)) return 0;
@@ -167,7 +116,7 @@
 	}
 
 
-int ec_GFp_simple_group_set_curve(EC_GROUP *group,
+static int ec_GFp_simple_group_set_curve(EC_GROUP *group,
 	const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
 	{
 	int ret = 0;
@@ -198,15 +147,11 @@
 
 	/* group->a */
 	if (!BN_nnmod(tmp_a, a, p, ctx)) goto err;
-	if (group->meth->field_encode)
-		{ if (!group->meth->field_encode(group, &group->a, tmp_a, ctx)) goto err; }	
-	else
-		if (!BN_copy(&group->a, tmp_a)) goto err;
+	{ if (!ec_GFp_mont_field_encode(group, &group->a, tmp_a, ctx)) goto err; }	
 	
 	/* group->b */
 	if (!BN_nnmod(&group->b, b, p, ctx)) goto err;
-	if (group->meth->field_encode)
-		if (!group->meth->field_encode(group, &group->b, &group->b, ctx)) goto err;
+	if (!ec_GFp_mont_field_encode(group, &group->b, &group->b, ctx)) goto err;
 	
 	/* group->a_is_minus3 */
 	if (!BN_add_word(tmp_a, 3)) goto err;
@@ -222,131 +167,7 @@
 	}
 
 
-int ec_GFp_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
-	{
-	int ret = 0;
-	BN_CTX *new_ctx = NULL;
-	
-	if (p != NULL)
-		{
-		if (!BN_copy(p, &group->field)) return 0;
-		}
-
-	if (a != NULL || b != NULL)
-		{
-		if (group->meth->field_decode)
-			{
-			if (ctx == NULL)
-				{
-				ctx = new_ctx = BN_CTX_new();
-				if (ctx == NULL)
-					return 0;
-				}
-			if (a != NULL)
-				{
-				if (!group->meth->field_decode(group, a, &group->a, ctx)) goto err;
-				}
-			if (b != NULL)
-				{
-				if (!group->meth->field_decode(group, b, &group->b, ctx)) goto err;
-				}
-			}
-		else
-			{
-			if (a != NULL)
-				{
-				if (!BN_copy(a, &group->a)) goto err;
-				}
-			if (b != NULL)
-				{
-				if (!BN_copy(b, &group->b)) goto err;
-				}
-			}
-		}
-	
-	ret = 1;
-	
- err:
-	if (new_ctx)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_group_get_degree(const EC_GROUP *group)
-	{
-	return BN_num_bits(&group->field);
-	}
-
-
-int ec_GFp_simple_group_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)
-	{
-	int ret = 0;
-	BIGNUM *a,*b,*order,*tmp_1,*tmp_2;
-	const BIGNUM *p = &group->field;
-	BN_CTX *new_ctx = NULL;
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT, ERR_R_MALLOC_FAILURE);
-			goto err;
-			}
-		}
-	BN_CTX_start(ctx);
-	a = BN_CTX_get(ctx);
-	b = BN_CTX_get(ctx);
-	tmp_1 = BN_CTX_get(ctx);
-	tmp_2 = BN_CTX_get(ctx);
-	order = BN_CTX_get(ctx);
-	if (order == NULL) goto err;
-
-	if (group->meth->field_decode)
-		{
-		if (!group->meth->field_decode(group, a, &group->a, ctx)) goto err;
-		if (!group->meth->field_decode(group, b, &group->b, ctx)) goto err;
-		}
-	else
-		{
-		if (!BN_copy(a, &group->a)) goto err;
-		if (!BN_copy(b, &group->b)) goto err;
-		}
-	
-	/* check the discriminant:
-	 * y^2 = x^3 + a*x + b is an elliptic curve <=> 4*a^3 + 27*b^2 != 0 (mod p) 
-         * 0 =< a, b < p */
-	if (BN_is_zero(a))
-		{
-		if (BN_is_zero(b)) goto err;
-		}
-	else if (!BN_is_zero(b))
-		{
-		if (!BN_mod_sqr(tmp_1, a, p, ctx)) goto err;
-		if (!BN_mod_mul(tmp_2, tmp_1, a, p, ctx)) goto err;
-		if (!BN_lshift(tmp_1, tmp_2, 2)) goto err;
-		/* tmp_1 = 4*a^3 */
-
-		if (!BN_mod_sqr(tmp_2, b, p, ctx)) goto err;
-		if (!BN_mul_word(tmp_2, 27)) goto err;
-		/* tmp_2 = 27*b^2 */
-
-		if (!BN_mod_add(a, tmp_1, tmp_2, p, ctx)) goto err;
-		if (BN_is_zero(a)) goto err;
-		}
-	ret = 1;
-
-err:
-	if (ctx != NULL)
-		BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_point_init(EC_POINT *point)
+static int ec_GFp_simple_point_init(EC_POINT *point)
 	{
 	BN_init(&point->X);
 	BN_init(&point->Y);
@@ -357,7 +178,7 @@
 	}
 
 
-void ec_GFp_simple_point_finish(EC_POINT *point)
+static void ec_GFp_simple_point_finish(EC_POINT *point)
 	{
 	BN_free(&point->X);
 	BN_free(&point->Y);
@@ -365,7 +186,7 @@
 	}
 
 
-void ec_GFp_simple_point_clear_finish(EC_POINT *point)
+static void ec_GFp_simple_point_clear_finish(EC_POINT *point)
 	{
 	BN_clear_free(&point->X);
 	BN_clear_free(&point->Y);
@@ -374,7 +195,7 @@
 	}
 
 
-int ec_GFp_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
+static int ec_GFp_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
 	{
 	if (!BN_copy(&dest->X, &src->X)) return 0;
 	if (!BN_copy(&dest->Y, &src->Y)) return 0;
@@ -385,7 +206,7 @@
 	}
 
 
-int ec_GFp_simple_point_set_to_infinity(const EC_GROUP *group, EC_POINT *point)
+static int ec_GFp_simple_point_set_to_infinity(const EC_GROUP *group, EC_POINT *point)
 	{
 	point->Z_is_one = 0;
 	BN_zero(&point->Z);
@@ -393,7 +214,7 @@
 	}
 
 
-int ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
+static int ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
 	const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx)
 	{
 	BN_CTX *new_ctx = NULL;
@@ -409,18 +230,16 @@
 	if (x != NULL)
 		{
 		if (!BN_nnmod(&point->X, x, &group->field, ctx)) goto err;
-		if (group->meth->field_encode)
 			{
-			if (!group->meth->field_encode(group, &point->X, &point->X, ctx)) goto err;
+			if (!ec_GFp_mont_field_encode(group, &point->X, &point->X, ctx)) goto err;
 			}
 		}
 	
 	if (y != NULL)
 		{
 		if (!BN_nnmod(&point->Y, y, &group->field, ctx)) goto err;
-		if (group->meth->field_encode)
 			{
-			if (!group->meth->field_encode(group, &point->Y, &point->Y, ctx)) goto err;
+			if (!ec_GFp_mont_field_encode(group, &point->Y, &point->Y, ctx)) goto err;
 			}
 		}
 	
@@ -430,15 +249,14 @@
 
 		if (!BN_nnmod(&point->Z, z, &group->field, ctx)) goto err;
 		Z_is_one = BN_is_one(&point->Z);
-		if (group->meth->field_encode)
 			{
-			if (Z_is_one && (group->meth->field_set_to_one != 0))
+			if (Z_is_one)
 				{
-				if (!group->meth->field_set_to_one(group, &point->Z, ctx)) goto err;
+				if (!ec_GFp_mont_field_set_to_one(group, &point->Z, ctx)) goto err;
 				}
 			else
 				{
-				if (!group->meth->field_encode(group, &point->Z, &point->Z, ctx)) goto err;
+				if (!ec_GFp_mont_field_encode(group, &point->Z, &point->Z, ctx)) goto err;
 				}
 			}
 		point->Z_is_one = Z_is_one;
@@ -453,60 +271,7 @@
 	}
 
 
-int ec_GFp_simple_get_Jprojective_coordinates_GFp(const EC_GROUP *group, const EC_POINT *point,
-	BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	int ret = 0;
-	
-	if (group->meth->field_decode != 0)
-		{
-		if (ctx == NULL)
-			{
-			ctx = new_ctx = BN_CTX_new();
-			if (ctx == NULL)
-				return 0;
-			}
-
-		if (x != NULL)
-			{
-			if (!group->meth->field_decode(group, x, &point->X, ctx)) goto err;
-			}
-		if (y != NULL)
-			{
-			if (!group->meth->field_decode(group, y, &point->Y, ctx)) goto err;
-			}
-		if (z != NULL)
-			{
-			if (!group->meth->field_decode(group, z, &point->Z, ctx)) goto err;
-			}
-		}
-	else	
-		{
-		if (x != NULL)
-			{
-			if (!BN_copy(x, &point->X)) goto err;
-			}
-		if (y != NULL)
-			{
-			if (!BN_copy(y, &point->Y)) goto err;
-			}
-		if (z != NULL)
-			{
-			if (!BN_copy(z, &point->Z)) goto err;
-			}
-		}
-	
-	ret = 1;
-
- err:
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_point_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,
+static int ec_GFp_simple_point_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,
 	const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx)
 	{
 	if (x == NULL || y == NULL)
@@ -516,11 +281,11 @@
 		return 0;
 		}
 
-	return EC_POINT_set_Jprojective_coordinates_GFp(group, point, x, y, BN_value_one(), ctx);
+	return ec_GFp_simple_set_Jprojective_coordinates_GFp(group, point, x, y, BN_value_one(), ctx);
 	}
 
 
-int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point,
+static int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point,
 	BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
 	{
 	BN_CTX *new_ctx = NULL;
@@ -550,38 +315,21 @@
 
 	/* transform  (X, Y, Z)  into  (x, y) := (X/Z^2, Y/Z^3) */
 	
-	if (group->meth->field_decode)
 		{
-		if (!group->meth->field_decode(group, Z, &point->Z, ctx)) goto err;
+		if (!ec_GFp_mont_field_decode(group, Z, &point->Z, ctx)) goto err;
 		Z_ = Z;
 		}
-	else
-		{
-		Z_ = &point->Z;
-		}
 	
 	if (BN_is_one(Z_))
 		{
-		if (group->meth->field_decode)
 			{
 			if (x != NULL)
 				{
-				if (!group->meth->field_decode(group, x, &point->X, ctx)) goto err;
+				if (!ec_GFp_mont_field_decode(group, x, &point->X, ctx)) goto err;
 				}
 			if (y != NULL)
 				{
-				if (!group->meth->field_decode(group, y, &point->Y, ctx)) goto err;
-				}
-			}
-		else
-			{
-			if (x != NULL)
-				{
-				if (!BN_copy(x, &point->X)) goto err;
-				}
-			if (y != NULL)
-				{
-				if (!BN_copy(y, &point->Y)) goto err;
+				if (!ec_GFp_mont_field_decode(group, y, &point->Y, ctx)) goto err;
 				}
 			}
 		}
@@ -593,12 +341,6 @@
 			goto err;
 			}
 		
-		if (group->meth->field_encode == 0)
-			{
-			/* field_sqr works on standard representation */
-			if (!group->meth->field_sqr(group, Z_2, Z_1, ctx)) goto err;
-			}
-		else
 			{
 			if (!BN_mod_sqr(Z_2, Z_1, &group->field, ctx)) goto err;
 			}
@@ -606,154 +348,19 @@
 		if (x != NULL)
 			{
 			/* in the Montgomery case, field_mul will cancel out Montgomery factor in X: */
-			if (!group->meth->field_mul(group, x, &point->X, Z_2, ctx)) goto err;
+			if (!ec_GFp_mont_field_mul(group, x, &point->X, Z_2, ctx)) goto err;
 			}
 
 		if (y != NULL)
 			{
-			if (group->meth->field_encode == 0)
-				{
-				/* field_mul works on standard representation */
-				if (!group->meth->field_mul(group, Z_3, Z_2, Z_1, ctx)) goto err;
-				}
-			else
 				{
 				if (!BN_mod_mul(Z_3, Z_2, Z_1, &group->field, ctx)) goto err;
 				}
 
 			/* in the Montgomery case, field_mul will cancel out Montgomery factor in Y: */
-			if (!group->meth->field_mul(group, y, &point->Y, Z_3, ctx)) goto err;
-			}
-		}
-
-	ret = 1;
-
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
-	const BIGNUM *x_, int y_bit, BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *tmp1, *tmp2, *x, *y;
-	int ret = 0;
-
-	/* clear error queue*/
-	ERR_clear_error();
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	y_bit = (y_bit != 0);
-
-	BN_CTX_start(ctx);
-	tmp1 = BN_CTX_get(ctx);
-	tmp2 = BN_CTX_get(ctx);
-	x = BN_CTX_get(ctx);
-	y = BN_CTX_get(ctx);
-	if (y == NULL) goto err;
-
-	/* Recover y.  We have a Weierstrass equation
-	 *     y^2 = x^3 + a*x + b,
-	 * so  y  is one of the square roots of  x^3 + a*x + b.
-	 */
-
-	/* tmp1 := x^3 */
-	if (!BN_nnmod(x, x_, &group->field,ctx)) goto err;
-	if (group->meth->field_decode == 0)
-		{
-		/* field_{sqr,mul} work on standard representation */
-		if (!group->meth->field_sqr(group, tmp2, x_, ctx)) goto err;
-		if (!group->meth->field_mul(group, tmp1, tmp2, x_, ctx)) goto err;
-		}
-	else
-		{
-		if (!BN_mod_sqr(tmp2, x_, &group->field, ctx)) goto err;
-		if (!BN_mod_mul(tmp1, tmp2, x_, &group->field, ctx)) goto err;
-		}
-	
-	/* tmp1 := tmp1 + a*x */
-	if (group->a_is_minus3)
-		{
-		if (!BN_mod_lshift1_quick(tmp2, x, &group->field)) goto err;
-		if (!BN_mod_add_quick(tmp2, tmp2, x, &group->field)) goto err;
-		if (!BN_mod_sub_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
-		}
-	else
-		{
-		if (group->meth->field_decode)
-			{
-			if (!group->meth->field_decode(group, tmp2, &group->a, ctx)) goto err;
-			if (!BN_mod_mul(tmp2, tmp2, x, &group->field, ctx)) goto err;
-			}
-		else
-			{
-			/* field_mul works on standard representation */
-			if (!group->meth->field_mul(group, tmp2, &group->a, x, ctx)) goto err;
+			if (!ec_GFp_mont_field_mul(group, y, &point->Y, Z_3, ctx)) goto err;
 			}
-		
-		if (!BN_mod_add_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
-		}
-	
-	/* tmp1 := tmp1 + b */
-	if (group->meth->field_decode)
-		{
-		if (!group->meth->field_decode(group, tmp2, &group->b, ctx)) goto err;
-		if (!BN_mod_add_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
 		}
-	else
-		{
-		if (!BN_mod_add_quick(tmp1, tmp1, &group->b, &group->field)) goto err;
-		}
-	
-	if (!BN_mod_sqrt(y, tmp1, &group->field, ctx))
-		{
-		unsigned long err = ERR_peek_last_error();
-		
-		if (ERR_GET_LIB(err) == ERR_LIB_BN && ERR_GET_REASON(err) == BN_R_NOT_A_SQUARE)
-			{
-			ERR_clear_error();
-			ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
-			}
-		else
-			ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_BN_LIB);
-		goto err;
-		}
-
-	if (y_bit != BN_is_odd(y))
-		{
-		if (BN_is_zero(y))
-			{
-			int kron;
-
-			kron = BN_kronecker(x, &group->field, ctx);
-			if (kron == -2) goto err;
-
-			if (kron == 1)
-				ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSION_BIT);
-			else
-				/* BN_mod_sqrt() should have cought this error (not a square) */
-				ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
-			goto err;
-			}
-		if (!BN_usub(y, &group->field, y)) goto err;
-		}
-	if (y_bit != BN_is_odd(y))
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_INTERNAL_ERROR);
-		goto err;
-		}
-
-	if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
 
 	ret = 1;
 
@@ -764,247 +371,8 @@
 	return ret;
 	}
 
-
-size_t ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
-	unsigned char *buf, size_t len, BN_CTX *ctx)
-	{
-	size_t ret;
-	BN_CTX *new_ctx = NULL;
-	int used_ctx = 0;
-	BIGNUM *x, *y;
-	size_t field_len, i, skip;
-
-	if ((form != POINT_CONVERSION_COMPRESSED)
-		&& (form != POINT_CONVERSION_UNCOMPRESSED)
-		&& (form != POINT_CONVERSION_HYBRID))
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_INVALID_FORM);
-		goto err;
-		}
-
-	if (EC_POINT_is_at_infinity(group, point))
-		{
-		/* encodes to a single 0 octet */
-		if (buf != NULL)
-			{
-			if (len < 1)
-				{
-				ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
-				return 0;
-				}
-			buf[0] = 0;
-			}
-		return 1;
-		}
-
-
-	/* ret := required output buffer length */
-	field_len = BN_num_bytes(&group->field);
-	ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
-
-	/* if 'buf' is NULL, just return required length */
-	if (buf != NULL)
-		{
-		if (len < ret)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
-			goto err;
-			}
-
-		if (ctx == NULL)
-			{
-			ctx = new_ctx = BN_CTX_new();
-			if (ctx == NULL)
-				return 0;
-			}
-
-		BN_CTX_start(ctx);
-		used_ctx = 1;
-		x = BN_CTX_get(ctx);
-		y = BN_CTX_get(ctx);
-		if (y == NULL) goto err;
-
-		if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-
-		if ((form == POINT_CONVERSION_COMPRESSED || form == POINT_CONVERSION_HYBRID) && BN_is_odd(y))
-			buf[0] = form + 1;
-		else
-			buf[0] = form;
-	
-		i = 1;
-		
-		skip = field_len - BN_num_bytes(x);
-		if (skip > field_len)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-			goto err;
-			}
-		while (skip > 0)
-			{
-			buf[i++] = 0;
-			skip--;
-			}
-		skip = BN_bn2bin(x, buf + i);
-		i += skip;
-		if (i != 1 + field_len)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-			goto err;
-			}
-
-		if (form == POINT_CONVERSION_UNCOMPRESSED || form == POINT_CONVERSION_HYBRID)
-			{
-			skip = field_len - BN_num_bytes(y);
-			if (skip > field_len)
-				{
-				ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-				goto err;
-				}
-			while (skip > 0)
-				{
-				buf[i++] = 0;
-				skip--;
-				}
-			skip = BN_bn2bin(y, buf + i);
-			i += skip;
-			}
-
-		if (i != ret)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-			goto err;
-			}
-		}
-	
-	if (used_ctx)
-		BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-
- err:
-	if (used_ctx)
-		BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return 0;
-	}
-
-
-int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
-	const unsigned char *buf, size_t len, BN_CTX *ctx)
-	{
-	point_conversion_form_t form;
-	int y_bit;
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *x, *y;
-	size_t field_len, enc_len;
-	int ret = 0;
-
-	if (len == 0)
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_BUFFER_TOO_SMALL);
-		return 0;
-		}
-	form = buf[0];
-	y_bit = form & 1;
-	form = form & ~1U;
-	if ((form != 0)	&& (form != POINT_CONVERSION_COMPRESSED)
-		&& (form != POINT_CONVERSION_UNCOMPRESSED)
-		&& (form != POINT_CONVERSION_HYBRID))
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-		return 0;
-		}
-	if ((form == 0 || form == POINT_CONVERSION_UNCOMPRESSED) && y_bit)
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-		return 0;
-		}
-
-	if (form == 0)
-		{
-		if (len != 1)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-			return 0;
-			}
-
-		return EC_POINT_set_to_infinity(group, point);
-		}
-	
-	field_len = BN_num_bytes(&group->field);
-	enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
-
-	if (len != enc_len)
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-		return 0;
-		}
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	BN_CTX_start(ctx);
-	x = BN_CTX_get(ctx);
-	y = BN_CTX_get(ctx);
-	if (y == NULL) goto err;
-
-	if (!BN_bin2bn(buf + 1, field_len, x)) goto err;
-	if (BN_ucmp(x, &group->field) >= 0)
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-		goto err;
-		}
-
-	if (form == POINT_CONVERSION_COMPRESSED)
-		{
-		if (!EC_POINT_set_compressed_coordinates_GFp(group, point, x, y_bit, ctx)) goto err;
-		}
-	else
-		{
-		if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) goto err;
-		if (BN_ucmp(y, &group->field) >= 0)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-			goto err;
-			}
-		if (form == POINT_CONVERSION_HYBRID)
-			{
-			if (y_bit != BN_is_odd(y))
-				{
-				ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-				goto err;
-				}
-			}
-
-		if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-		}
-	
-	if (!EC_POINT_is_on_curve(group, point, ctx)) /* test required by X9.62 */
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);
-		goto err;
-		}
-
-	ret = 1;
-	
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
+static int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
 	{
-	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);
-	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
 	const BIGNUM *p;
 	BN_CTX *new_ctx = NULL;
 	BIGNUM *n0, *n1, *n2, *n3, *n4, *n5, *n6;
@@ -1017,8 +385,6 @@
 	if (EC_POINT_is_at_infinity(group, b))
 		return EC_POINT_copy(r, a);
 	
-	field_mul = group->meth->field_mul;
-	field_sqr = group->meth->field_sqr;
 	p = &group->field;
 
 	if (ctx == NULL)
@@ -1053,12 +419,12 @@
 		}
 	else
 		{
-		if (!field_sqr(group, n0, &b->Z, ctx)) goto end;
-		if (!field_mul(group, n1, &a->X, n0, ctx)) goto end;
+		if (!ec_GFp_mont_field_sqr(group, n0, &b->Z, ctx)) goto end;
+		if (!ec_GFp_mont_field_mul(group, n1, &a->X, n0, ctx)) goto end;
 		/* n1 = X_a * Z_b^2 */
 
-		if (!field_mul(group, n0, n0, &b->Z, ctx)) goto end;
-		if (!field_mul(group, n2, &a->Y, n0, ctx)) goto end;
+		if (!ec_GFp_mont_field_mul(group, n0, n0, &b->Z, ctx)) goto end;
+		if (!ec_GFp_mont_field_mul(group, n2, &a->Y, n0, ctx)) goto end;
 		/* n2 = Y_a * Z_b^3 */
 		}
 
@@ -1072,12 +438,12 @@
 		}
 	else
 		{
-		if (!field_sqr(group, n0, &a->Z, ctx)) goto end;
-		if (!field_mul(group, n3, &b->X, n0, ctx)) goto end;
+		if (!ec_GFp_mont_field_sqr(group, n0, &a->Z, ctx)) goto end;
+		if (!ec_GFp_mont_field_mul(group, n3, &b->X, n0, ctx)) goto end;
 		/* n3 = X_b * Z_a^2 */
 
-		if (!field_mul(group, n0, n0, &a->Z, ctx)) goto end;
-		if (!field_mul(group, n4, &b->Y, n0, ctx)) goto end;
+		if (!ec_GFp_mont_field_mul(group, n0, n0, &a->Z, ctx)) goto end;
+		if (!ec_GFp_mont_field_mul(group, n4, &b->Y, n0, ctx)) goto end;
 		/* n4 = Y_b * Z_a^3 */
 		}
 
@@ -1125,16 +491,16 @@
 		else if (b->Z_is_one)
 			{ if (!BN_copy(n0, &a->Z)) goto end; }
 		else
-			{ if (!field_mul(group, n0, &a->Z, &b->Z, ctx)) goto end; }
-		if (!field_mul(group, &r->Z, n0, n5, ctx)) goto end;
+			{ if (!ec_GFp_mont_field_mul(group, n0, &a->Z, &b->Z, ctx)) goto end; }
+		if (!ec_GFp_mont_field_mul(group, &r->Z, n0, n5, ctx)) goto end;
 		}
 	r->Z_is_one = 0;
 	/* Z_r = Z_a * Z_b * n5 */
 
 	/* X_r */
-	if (!field_sqr(group, n0, n6, ctx)) goto end;
-	if (!field_sqr(group, n4, n5, ctx)) goto end;
-	if (!field_mul(group, n3, n1, n4, ctx)) goto end;
+	if (!ec_GFp_mont_field_sqr(group, n0, n6, ctx)) goto end;
+	if (!ec_GFp_mont_field_sqr(group, n4, n5, ctx)) goto end;
+	if (!ec_GFp_mont_field_mul(group, n3, n1, n4, ctx)) goto end;
 	if (!BN_mod_sub_quick(&r->X, n0, n3, p)) goto end;
 	/* X_r = n6^2 - n5^2 * 'n7' */
 	
@@ -1144,9 +510,9 @@
 	/* n9 = n5^2 * 'n7' - 2 * X_r */
 
 	/* Y_r */
-	if (!field_mul(group, n0, n0, n6, ctx)) goto end;
-	if (!field_mul(group, n5, n4, n5, ctx)) goto end; /* now n5 is n5^3 */
-	if (!field_mul(group, n1, n2, n5, ctx)) goto end;
+	if (!ec_GFp_mont_field_mul(group, n0, n0, n6, ctx)) goto end;
+	if (!ec_GFp_mont_field_mul(group, n5, n4, n5, ctx)) goto end; /* now n5 is n5^3 */
+	if (!ec_GFp_mont_field_mul(group, n1, n2, n5, ctx)) goto end;
 	if (!BN_mod_sub_quick(n0, n0, n1, p)) goto end;
 	if (BN_is_odd(n0))
 		if (!BN_add(n0, n0, p)) goto end;
@@ -1165,10 +531,8 @@
 	}
 
 
-int ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *ctx)
+static int ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *ctx)
 	{
-	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);
-	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
 	const BIGNUM *p;
 	BN_CTX *new_ctx = NULL;
 	BIGNUM *n0, *n1, *n2, *n3;
@@ -1181,8 +545,6 @@
 		return 1;
 		}
 
-	field_mul = group->meth->field_mul;
-	field_sqr = group->meth->field_sqr;
 	p = &group->field;
 
 	if (ctx == NULL)
@@ -1207,7 +569,7 @@
 	/* n1 */
 	if (a->Z_is_one)
 		{
-		if (!field_sqr(group, n0, &a->X, ctx)) goto err;
+		if (!ec_GFp_mont_field_sqr(group, n0, &a->X, ctx)) goto err;
 		if (!BN_mod_lshift1_quick(n1, n0, p)) goto err;
 		if (!BN_mod_add_quick(n0, n0, n1, p)) goto err;
 		if (!BN_mod_add_quick(n1, n0, &group->a, p)) goto err;
@@ -1215,10 +577,10 @@
 		}
 	else if (group->a_is_minus3)
 		{
-		if (!field_sqr(group, n1, &a->Z, ctx)) goto err;
+		if (!ec_GFp_mont_field_sqr(group, n1, &a->Z, ctx)) goto err;
 		if (!BN_mod_add_quick(n0, &a->X, n1, p)) goto err;
 		if (!BN_mod_sub_quick(n2, &a->X, n1, p)) goto err;
-		if (!field_mul(group, n1, n0, n2, ctx)) goto err;
+		if (!ec_GFp_mont_field_mul(group, n1, n0, n2, ctx)) goto err;
 		if (!BN_mod_lshift1_quick(n0, n1, p)) goto err;
 		if (!BN_mod_add_quick(n1, n0, n1, p)) goto err;
 		/* n1 = 3 * (X_a + Z_a^2) * (X_a - Z_a^2)
@@ -1226,12 +588,12 @@
 		}
 	else
 		{
-		if (!field_sqr(group, n0, &a->X, ctx)) goto err;
+		if (!ec_GFp_mont_field_sqr(group, n0, &a->X, ctx)) goto err;
 		if (!BN_mod_lshift1_quick(n1, n0, p)) goto err;
 		if (!BN_mod_add_quick(n0, n0, n1, p)) goto err;
-		if (!field_sqr(group, n1, &a->Z, ctx)) goto err;
-		if (!field_sqr(group, n1, n1, ctx)) goto err;
-		if (!field_mul(group, n1, n1, &group->a, ctx)) goto err;
+		if (!ec_GFp_mont_field_sqr(group, n1, &a->Z, ctx)) goto err;
+		if (!ec_GFp_mont_field_sqr(group, n1, n1, ctx)) goto err;
+		if (!ec_GFp_mont_field_mul(group, n1, n1, &group->a, ctx)) goto err;
 		if (!BN_mod_add_quick(n1, n1, n0, p)) goto err;
 		/* n1 = 3 * X_a^2 + a_curve * Z_a^4 */
 		}
@@ -1243,32 +605,32 @@
 		}
 	else
 		{
-		if (!field_mul(group, n0, &a->Y, &a->Z, ctx)) goto err;
+		if (!ec_GFp_mont_field_mul(group, n0, &a->Y, &a->Z, ctx)) goto err;
 		}
 	if (!BN_mod_lshift1_quick(&r->Z, n0, p)) goto err;
 	r->Z_is_one = 0;
 	/* Z_r = 2 * Y_a * Z_a */
 
 	/* n2 */
-	if (!field_sqr(group, n3, &a->Y, ctx)) goto err;
-	if (!field_mul(group, n2, &a->X, n3, ctx)) goto err;
+	if (!ec_GFp_mont_field_sqr(group, n3, &a->Y, ctx)) goto err;
+	if (!ec_GFp_mont_field_mul(group, n2, &a->X, n3, ctx)) goto err;
 	if (!BN_mod_lshift_quick(n2, n2, 2, p)) goto err;
 	/* n2 = 4 * X_a * Y_a^2 */
 
 	/* X_r */
 	if (!BN_mod_lshift1_quick(n0, n2, p)) goto err;
-	if (!field_sqr(group, &r->X, n1, ctx)) goto err;
+	if (!ec_GFp_mont_field_sqr(group, &r->X, n1, ctx)) goto err;
 	if (!BN_mod_sub_quick(&r->X, &r->X, n0, p)) goto err;
 	/* X_r = n1^2 - 2 * n2 */
 	
 	/* n3 */
-	if (!field_sqr(group, n0, n3, ctx)) goto err;
+	if (!ec_GFp_mont_field_sqr(group, n0, n3, ctx)) goto err;
 	if (!BN_mod_lshift_quick(n3, n0, 3, p)) goto err;
 	/* n3 = 8 * Y_a^4 */
 	
 	/* Y_r */
 	if (!BN_mod_sub_quick(n0, n2, &r->X, p)) goto err;
-	if (!field_mul(group, n0, n1, n0, ctx)) goto err;
+	if (!ec_GFp_mont_field_mul(group, n0, n1, n0, ctx)) goto err;
 	if (!BN_mod_sub_quick(&r->Y, n0, n3, p)) goto err;
 	/* Y_r = n1 * (n2 - X_r) - n3 */
 
@@ -1282,7 +644,7 @@
 	}
 
 
-int ec_GFp_simple_invert(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
+static int ec_GFp_simple_invert(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
 	{
 	if (EC_POINT_is_at_infinity(group, point) || BN_is_zero(&point->Y))
 		/* point is its own inverse */
@@ -1292,104 +654,13 @@
 	}
 
 
-int ec_GFp_simple_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)
+static int ec_GFp_simple_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)
 	{
 	return BN_is_zero(&point->Z);
 	}
 
 
-int ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_CTX *ctx)
-	{
-	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);
-	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
-	const BIGNUM *p;
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *rh, *tmp, *Z4, *Z6;
-	int ret = -1;
-
-	if (EC_POINT_is_at_infinity(group, point))
-		return 1;
-	
-	field_mul = group->meth->field_mul;
-	field_sqr = group->meth->field_sqr;
-	p = &group->field;
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return -1;
-		}
-
-	BN_CTX_start(ctx);
-	rh = BN_CTX_get(ctx);
-	tmp = BN_CTX_get(ctx);
-	Z4 = BN_CTX_get(ctx);
-	Z6 = BN_CTX_get(ctx);
-	if (Z6 == NULL) goto err;
-
-	/* We have a curve defined by a Weierstrass equation
-	 *      y^2 = x^3 + a*x + b.
-	 * The point to consider is given in Jacobian projective coordinates
-	 * where  (X, Y, Z)  represents  (x, y) = (X/Z^2, Y/Z^3).
-	 * Substituting this and multiplying by  Z^6  transforms the above equation into
-	 *      Y^2 = X^3 + a*X*Z^4 + b*Z^6.
-	 * To test this, we add up the right-hand side in 'rh'.
-	 */
-
-	/* rh := X^2 */
-	if (!field_sqr(group, rh, &point->X, ctx)) goto err;
-
-	if (!point->Z_is_one)
-		{
-		if (!field_sqr(group, tmp, &point->Z, ctx)) goto err;
-		if (!field_sqr(group, Z4, tmp, ctx)) goto err;
-		if (!field_mul(group, Z6, Z4, tmp, ctx)) goto err;
-
-		/* rh := (rh + a*Z^4)*X */
-		if (group->a_is_minus3)
-			{
-			if (!BN_mod_lshift1_quick(tmp, Z4, p)) goto err;
-			if (!BN_mod_add_quick(tmp, tmp, Z4, p)) goto err;
-			if (!BN_mod_sub_quick(rh, rh, tmp, p)) goto err;
-			if (!field_mul(group, rh, rh, &point->X, ctx)) goto err;
-			}
-		else
-			{
-			if (!field_mul(group, tmp, Z4, &group->a, ctx)) goto err;
-			if (!BN_mod_add_quick(rh, rh, tmp, p)) goto err;
-			if (!field_mul(group, rh, rh, &point->X, ctx)) goto err;
-			}
-
-		/* rh := rh + b*Z^6 */
-		if (!field_mul(group, tmp, &group->b, Z6, ctx)) goto err;
-		if (!BN_mod_add_quick(rh, rh, tmp, p)) goto err;
-		}
-	else
-		{
-		/* point->Z_is_one */
-
-		/* rh := (rh + a)*X */
-		if (!BN_mod_add_quick(rh, rh, &group->a, p)) goto err;
-		if (!field_mul(group, rh, rh, &point->X, ctx)) goto err;
-		/* rh := rh + b */
-		if (!BN_mod_add_quick(rh, rh, &group->b, p)) goto err;
-		}
-
-	/* 'lh' := Y^2 */
-	if (!field_sqr(group, tmp, &point->Y, ctx)) goto err;
-
-	ret = (0 == BN_ucmp(tmp, rh));
-
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
+static int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
 	{
 	/* return values:
 	 *  -1   error
@@ -1397,8 +668,6 @@
 	 *   1   not equal
 	 */
 
-	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);
-	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
 	BN_CTX *new_ctx = NULL;
 	BIGNUM *tmp1, *tmp2, *Za23, *Zb23;
 	const BIGNUM *tmp1_, *tmp2_;
@@ -1408,15 +677,15 @@
 		{
 		return EC_POINT_is_at_infinity(group, b) ? 0 : 1;
 		}
+
+	if (EC_POINT_is_at_infinity(group, b))
+		return 1;
 	
 	if (a->Z_is_one && b->Z_is_one)
 		{
 		return ((BN_cmp(&a->X, &b->X) == 0) && BN_cmp(&a->Y, &b->Y) == 0) ? 0 : 1;
 		}
 
-	field_mul = group->meth->field_mul;
-	field_sqr = group->meth->field_sqr;
-
 	if (ctx == NULL)
 		{
 		ctx = new_ctx = BN_CTX_new();
@@ -1439,16 +708,16 @@
 
 	if (!b->Z_is_one)
 		{
-		if (!field_sqr(group, Zb23, &b->Z, ctx)) goto end;
-		if (!field_mul(group, tmp1, &a->X, Zb23, ctx)) goto end;
+		if (!ec_GFp_mont_field_sqr(group, Zb23, &b->Z, ctx)) goto end;
+		if (!ec_GFp_mont_field_mul(group, tmp1, &a->X, Zb23, ctx)) goto end;
 		tmp1_ = tmp1;
 		}
 	else
 		tmp1_ = &a->X;
 	if (!a->Z_is_one)
 		{
-		if (!field_sqr(group, Za23, &a->Z, ctx)) goto end;
-		if (!field_mul(group, tmp2, &b->X, Za23, ctx)) goto end;
+		if (!ec_GFp_mont_field_sqr(group, Za23, &a->Z, ctx)) goto end;
+		if (!ec_GFp_mont_field_mul(group, tmp2, &b->X, Za23, ctx)) goto end;
 		tmp2_ = tmp2;
 		}
 	else
@@ -1464,16 +733,16 @@
 
 	if (!b->Z_is_one)
 		{
-		if (!field_mul(group, Zb23, Zb23, &b->Z, ctx)) goto end;
-		if (!field_mul(group, tmp1, &a->Y, Zb23, ctx)) goto end;
+		if (!ec_GFp_mont_field_mul(group, Zb23, Zb23, &b->Z, ctx)) goto end;
+		if (!ec_GFp_mont_field_mul(group, tmp1, &a->Y, Zb23, ctx)) goto end;
 		/* tmp1_ = tmp1 */
 		}
 	else
 		tmp1_ = &a->Y;
 	if (!a->Z_is_one)
 		{
-		if (!field_mul(group, Za23, Za23, &a->Z, ctx)) goto end;
-		if (!field_mul(group, tmp2, &b->Y, Za23, ctx)) goto end;
+		if (!ec_GFp_mont_field_mul(group, Za23, Za23, &a->Z, ctx)) goto end;
+		if (!ec_GFp_mont_field_mul(group, tmp2, &b->Y, Za23, ctx)) goto end;
 		/* tmp2_ = tmp2 */
 		}
 	else
@@ -1497,46 +766,7 @@
 	}
 
 
-int ec_GFp_simple_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *x, *y;
-	int ret = 0;
-
-	if (point->Z_is_one || EC_POINT_is_at_infinity(group, point))
-		return 1;
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	BN_CTX_start(ctx);
-	x = BN_CTX_get(ctx);
-	y = BN_CTX_get(ctx);
-	if (y == NULL) goto err;
-
-	if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-	if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-	if (!point->Z_is_one)
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_MAKE_AFFINE, ERR_R_INTERNAL_ERROR);
-		goto err;
-		}
-	
-	ret = 1;
-
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx)
+static int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx)
 	{
 	BN_CTX *new_ctx = NULL;
 	BIGNUM *tmp0, *tmp1;
@@ -1617,7 +847,7 @@
 					}
 				else
 					{
-					if (!group->meth->field_mul(group, heap[i],
+					if (!ec_GFp_mont_field_mul(group, heap[i],
 						heap[2*i], heap[2*i + 1], ctx)) goto err;
 					}
 				}
@@ -1633,13 +863,12 @@
 			goto err;
 			}
 		}
-	if (group->meth->field_encode != 0)
 		{
 		/* in the Montgomery case, we just turned  R*H  (representing H)
 		 * into  1/(R*H),  but we need  R*(1/H)  (representing 1/H);
 		 * i.e. we have need to multiply by the Montgomery factor twice */
-		if (!group->meth->field_encode(group, heap[1], heap[1], ctx)) goto err;
-		if (!group->meth->field_encode(group, heap[1], heap[1], ctx)) goto err;
+		if (!ec_GFp_mont_field_encode(group, heap[1], heap[1], ctx)) goto err;
+		if (!ec_GFp_mont_field_encode(group, heap[1], heap[1], ctx)) goto err;
 		}
 
 	/* set other heap[i]'s to their inverses */
@@ -1648,8 +877,8 @@
 		/* i is even */
 		if ((heap[i + 1] != NULL) && !BN_is_zero(heap[i + 1]))
 			{
-			if (!group->meth->field_mul(group, tmp0, heap[i/2], heap[i + 1], ctx)) goto err;
-			if (!group->meth->field_mul(group, tmp1, heap[i/2], heap[i], ctx)) goto err;
+			if (!ec_GFp_mont_field_mul(group, tmp0, heap[i/2], heap[i + 1], ctx)) goto err;
+			if (!ec_GFp_mont_field_mul(group, tmp1, heap[i/2], heap[i], ctx)) goto err;
 			if (!BN_copy(heap[i], tmp0)) goto err;
 			if (!BN_copy(heap[i + 1], tmp1)) goto err;
 			}
@@ -1668,19 +897,14 @@
 			{
 			/* turn  (X, Y, 1/Z)  into  (X/Z^2, Y/Z^3, 1) */
 
-			if (!group->meth->field_sqr(group, tmp1, &p->Z, ctx)) goto err;
-			if (!group->meth->field_mul(group, &p->X, &p->X, tmp1, ctx)) goto err;
+			if (!ec_GFp_mont_field_sqr(group, tmp1, &p->Z, ctx)) goto err;
+			if (!ec_GFp_mont_field_mul(group, &p->X, &p->X, tmp1, ctx)) goto err;
 
-			if (!group->meth->field_mul(group, tmp1, tmp1, &p->Z, ctx)) goto err;
-			if (!group->meth->field_mul(group, &p->Y, &p->Y, tmp1, ctx)) goto err;
+			if (!ec_GFp_mont_field_mul(group, tmp1, tmp1, &p->Z, ctx)) goto err;
+			if (!ec_GFp_mont_field_mul(group, &p->Y, &p->Y, tmp1, ctx)) goto err;
 		
-			if (group->meth->field_set_to_one != 0)
 				{
-				if (!group->meth->field_set_to_one(group, &p->Z, ctx)) goto err;
-				}
-			else
-				{
-				if (!BN_one(&p->Z)) goto err;
+				if (!ec_GFp_mont_field_set_to_one(group, &p->Z, ctx)) goto err;
 				}
 			p->Z_is_one = 1;
 			}
@@ -1705,16 +929,3 @@
 	return ret;
 	}
 
-
-int ec_GFp_simple_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-	{
-	return BN_mod_mul(r, a, b, &group->field, ctx);
-	}
-
-
-int ec_GFp_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
-	{
-	return BN_mod_sqr(r, a, &group->field, ctx);
-	}
-
-#endif

makemkv-oss-1.8.7.tar.gz/libabi/pssl/ecs_ossl.c -> makemkv-oss-1.8.8.tar.gz/libabi/pssl/ecs_ossl.c Changed

@@ -1,4 +1,4 @@
-/* crypto/ecdsa/ecs_ossl.c */
+/* crypto/ecds18;5~a/ecs_ossl.c */
 /*
  * Written by Nils Larsch for the OpenSSL project
  */
@@ -56,38 +56,8 @@
  *
  */
 
-#include "ecs_locl.h"
-#ifndef SKIP_PRIVATE_OSSL
-
-#include <openssl/err.h>
-#include <openssl/obj_mac.h>
+//#include <openssl/obj_mac.h>
 #include <openssl/bn.h>
-#include <stdlib.h>
-
-static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dlen, 
-		const BIGNUM *, const BIGNUM *, EC_KEY *eckey);
-static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, 
-		BIGNUM **rp);
-static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len, 
-		const ECDSA_SIG *sig, EC_KEY *eckey);
-
-static ECDSA_METHOD openssl_ecdsa_meth = {
-	"PrivateSSL ECDSA method",
-	ecdsa_do_sign,
-	ecdsa_sign_setup,
-	ecdsa_do_verify,
-#if 0
-	NULL, /* init     */
-	NULL, /* finish   */
-#endif
-	0,    /* flags    */
-	NULL  /* app_data */
-};
-
-const ECDSA_METHOD *ECDSA_PrivateSSL(void)
-{
-	return &openssl_ecdsa_meth;
-}
 
 static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
 		BIGNUM **rp)
@@ -147,13 +117,20 @@
 			}
 		while (BN_is_zero(k));
 
+		/* We do not want timing information to leak the length of k,
+		 * so we compute G*k using an equivalent scalar of fixed
+		 * bit-length. */
+
+		if (!BN_add(k, k, order)) goto err;
+		if (BN_num_bits(k) <= BN_num_bits(order))
+			if (!BN_add(k, k, order)) goto err;
+
 		/* compute r the x-coordinate of generator * k */
 		if (!EC_POINT_mul(group, tmp_point, k, NULL, NULL, ctx))
 		{
 			ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB);
 			goto err;
 		}
-		if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field)
 		{
 			if (!EC_POINT_get_affine_coordinates_GFp(group,
 				tmp_point, X, NULL, ctx))
@@ -162,15 +139,6 @@
 				goto err;
 			}
 		}
-		else /* NID_X9_62_characteristic_two_field */
-		{
-			if (!EC_POINT_get_affine_coordinates_GF2m(group,
-				tmp_point, X, NULL, ctx))
-			{
-				ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP,ERR_R_EC_LIB);
-				goto err;
-			}
-		}
 		if (!BN_nnmod(r, X, order, ctx))
 		{
 			ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_BN_LIB);
@@ -215,7 +183,7 @@
 static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dgst_len, 
 		const BIGNUM *in_kinv, const BIGNUM *in_r, EC_KEY *eckey)
 {
-	int     ok = 0;
+	int     ok = 0, i;
 	BIGNUM *kinv=NULL, *s, *m=NULL,*tmp=NULL,*order=NULL;
 	const BIGNUM *ckinv;
 	BN_CTX     *ctx = NULL;
@@ -252,14 +220,19 @@
 		ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_EC_LIB);
 		goto err;
 	}
-	if (dgst_len > BN_num_bytes(order))
+	i = BN_num_bits(order);
+	/* Need to truncate digest if it is too long: first truncate whole
+	 * bytes.
+	 */
+	if (8 * dgst_len > i)
+		dgst_len = (i + 7)/8;
+	if (!BN_bin2bn(dgst, dgst_len, m))
 	{
-		ECDSAerr(ECDSA_F_ECDSA_DO_SIGN,
-			ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
+		ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB);
 		goto err;
 	}
-
-	if (!BN_bin2bn(dgst, dgst_len, m))
+	/* If still too long truncate remaining bits with a shift */
+	if ((8 * dgst_len > i) && !BN_rshift(m, m, 8 - (i & 0x7)))
 	{
 		ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB);
 		goto err;
@@ -339,7 +312,7 @@
 static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len,
 		const ECDSA_SIG *sig, EC_KEY *eckey)
 {
-	int ret = -1;
+	int ret = -1, i;
 	BN_CTX   *ctx;
 	BIGNUM   *order, *u1, *u2, *m, *X;
 	EC_POINT *point = NULL;
@@ -393,11 +366,23 @@
 		goto err;
 	}
 	/* digest -> m */
+	i = BN_num_bits(order);
+	/* Need to truncate digest if it is too long: first truncate whole
+	 * bytes.
+	 */
+	if (8 * dgst_len > i)
+		dgst_len = (i + 7)/8;
 	if (!BN_bin2bn(dgst, dgst_len, m))
 	{
 		ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB);
 		goto err;
 	}
+	/* If still too long truncate remaining bits with a shift */
+	if ((8 * dgst_len > i) && !BN_rshift(m, m, 8 - (i & 0x7)))
+	{
+		ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB);
+		goto err;
+	}
 	/* u1 = m * tmp mod order */
 	if (!BN_mod_mul(u1, m, u2, order, ctx))
 	{
@@ -421,7 +406,6 @@
 		ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB);
 		goto err;
 	}
-	if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field)
 	{
 		if (!EC_POINT_get_affine_coordinates_GFp(group,
 			point, X, NULL, ctx))
@@ -430,16 +414,6 @@
 			goto err;
 		}
 	}
-	else /* NID_X9_62_characteristic_two_field */
-	{
-		if (!EC_POINT_get_affine_coordinates_GF2m(group,
-			point, X, NULL, ctx))
-		{
-			ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB);
-			goto err;
-		}
-	}
-	
 	if (!BN_nnmod(u1, X, order, ctx))
 	{
 		ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB);
@@ -455,9 +429,10 @@
 	return ret;
 }
 
-ECDSA_SIG *ECDSA_SIG_new(void)
+static ECDSA_SIG *ECDSA_SIG_new(void)
 {
-	ECDSA_SIG *p = malloc(sizeof(ECDSA_SIG));
+	ECDSA_SIG *p = OPENSSL_malloc(sizeof(ECDSA_SIG));
+	if (!p) return NULL;
 
 	p->r = BN_new();
 	p->s = BN_new();
@@ -465,12 +440,11 @@
 	return p;
 }
 
-void ECDSA_SIG_free(ECDSA_SIG *p)
+static void ECDSA_SIG_free(ECDSA_SIG *p)
 {
+	if (!p) return;
+
 	BN_free(p->r);
 	BN_free(p->s);
-	free(p);
+	OPENSSL_free(p);
 }
-
-#endif
-

makemkv-oss-1.8.7.tar.gz/libabi/pssl/ecs_sign.c -> makemkv-oss-1.8.8.tar.gz/libabi/pssl/ecs_sign.c Changed

makemkv-oss-1.8.7.tar.gz/libabi/pssl/ecs_vrf.c -> makemkv-oss-1.8.8.tar.gz/libabi/pssl/ecs_vrf.c Changed

makemkv-oss-1.8.8.tar.gz/libabi/pssl/pssl.h Added

makemkv-oss-1.8.7.tar.gz/libabi/src/httplinux.cpp -> makemkv-oss-1.8.8.tar.gz/libabi/src/httplinux.cpp Changed

makemkv-oss-1.8.7.tar.gz/libabi/src/httpmac.cpp -> makemkv-oss-1.8.8.tar.gz/libabi/src/httpmac.cpp Changed

makemkv-oss-1.8.7.tar.gz/libabi/src/httpwin.cpp -> makemkv-oss-1.8.8.tar.gz/libabi/src/httpwin.cpp Changed

makemkv-oss-1.8.7.tar.gz/libabi/src/ossl_aes.c -> makemkv-oss-1.8.8.tar.gz/libabi/src/ossl_aes.c Changed

makemkv-oss-1.8.7.tar.gz/libabi/src/ossl_ec.c -> makemkv-oss-1.8.8.tar.gz/libabi/src/ossl_ec.c Changed

@@ -1,7 +1,7 @@
 /*
     libMakeMKV - MKV multiplexer library
 
-    Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com>
+    Copyright (C) 2007-2014 GuinpinSoft inc <libmkv@makemkv.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -20,13 +20,17 @@
 */
 #include <lgpl/osslabi.h>
 #include <openssl/opensslconf.h>
+#include <openssl/crypto.h>
 
-#ifndef OPENSSL_NO_EC
+#if defined(OPENSSL_FIPS) && defined(OPENSSL_HAVE_INIT)
+#define UGLY_FEDORA // always disables EC with key size < 256 bits
+#endif
+
+#if defined(OPENSSL_NO_EC) || defined(FORCE_OPENSSL_NO_EC) || defined(UGLY_FEDORA)
+#include "../pssl/pssl.h"
+#else
 #include <openssl/ec.h>
 #include <openssl/ecdsa.h>
-#else
-#include <pssl/ec.h>
-#include <pssl/ecdsa.h>
 #endif
 
 /* BN */
@@ -100,7 +104,13 @@
 
 int OSSL_EC_GROUP_set_generator(OSSL_EC_GROUP *grp, const OSSL_EC_POINT *generator, const OSSL_BIGNUM *order, const OSSL_BIGNUM *cofactor)
 {
-    return EC_GROUP_set_generator((EC_GROUP *)grp,(const EC_POINT *)generator, (const BIGNUM *)order, (const BIGNUM *)cofactor);
+    int r;
+    r = EC_GROUP_set_generator((EC_GROUP *)grp,(const EC_POINT *)generator, (const BIGNUM *)order, (const BIGNUM *)cofactor);
+    if (r)
+    {
+        EC_GROUP_precompute_mult((EC_GROUP *)grp,NULL);
+    }
+    return r;
 }
 
 int OSSL_EC_GROUP_get_order(const OSSL_EC_GROUP *grp, OSSL_BIGNUM *order, OSSL_BN_CTX *ctx)
@@ -110,7 +120,22 @@
 
 OSSL_EC_GROUP *OSSL_EC_GROUP_new_curve_GFp(const OSSL_BIGNUM *p, const OSSL_BIGNUM *a, const OSSL_BIGNUM *b, OSSL_BN_CTX *ctx)
 {
-    return (OSSL_EC_GROUP *) EC_GROUP_new_curve_GFp((const BIGNUM *)p, (const BIGNUM *)a, (const BIGNUM *)b, (BN_CTX *)ctx);
+    const EC_METHOD *meth;
+    EC_GROUP *grp;
+
+    meth = EC_GFp_mont_method();
+    if (meth == NULL) return NULL;
+
+    grp = EC_GROUP_new(meth);
+    if (grp == NULL) return NULL;
+
+    if (!EC_GROUP_set_curve_GFp(grp, (const BIGNUM *)p, (const BIGNUM *)a, (const BIGNUM *)b, (BN_CTX *)ctx))
+    {
+        EC_GROUP_clear_free(grp);
+        return NULL;
+    }
+
+    return (OSSL_EC_GROUP *)grp;
 }
 
 OSSL_EC_POINT *OSSL_EC_POINT_new(const OSSL_EC_GROUP *grp)

makemkv-oss-1.8.7.tar.gz/libabi/src/ossl_sha.c -> makemkv-oss-1.8.8.tar.gz/libabi/src/ossl_sha.c Changed

makemkv-oss-1.8.7.tar.gz/libabi/src/sys_linux.c -> makemkv-oss-1.8.8.tar.gz/libabi/src/sys_linux.c Changed

makemkv-oss-1.8.7.tar.gz/libabi/src/xpat.c -> makemkv-oss-1.8.8.tar.gz/libabi/src/xpat.c Changed

makemkv-oss-1.8.7.tar.gz/libabi/src/zlib.c -> makemkv-oss-1.8.8.tar.gz/libabi/src/zlib.c Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/inc/driveio/driveio.h -> makemkv-oss-1.8.8.tar.gz/libdriveio/inc/driveio/driveio.h Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/inc/driveio/scsicmd.h -> makemkv-oss-1.8.8.tar.gz/libdriveio/inc/driveio/scsicmd.h Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/inc/lgpl/tcpip.h -> makemkv-oss-1.8.8.tar.gz/libdriveio/inc/lgpl/tcpip.h Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/src/drives/drive.h -> makemkv-oss-1.8.8.tar.gz/libdriveio/src/drives/drive.h Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/src/drives/pioneer.cpp -> makemkv-oss-1.8.8.tar.gz/libdriveio/src/drives/pioneer.cpp Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/src/drives/xboxhddvd.cpp -> makemkv-oss-1.8.8.tar.gz/libdriveio/src/drives/xboxhddvd.cpp Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/src/infolist.cpp -> makemkv-oss-1.8.8.tar.gz/libdriveio/src/infolist.cpp Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/src/scsihlp.cpp -> makemkv-oss-1.8.8.tar.gz/libdriveio/src/scsihlp.cpp Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/src/scsihlp.h -> makemkv-oss-1.8.8.tar.gz/libdriveio/src/scsihlp.h Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/src/stdquery.cpp -> makemkv-oss-1.8.8.tar.gz/libdriveio/src/stdquery.cpp Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/src/tipclient.cpp -> makemkv-oss-1.8.8.tar.gz/libdriveio/src/tipclient.cpp Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/src/tipcommon.cpp -> makemkv-oss-1.8.8.tar.gz/libdriveio/src/tipcommon.cpp Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/src/tipcommon.h -> makemkv-oss-1.8.8.tar.gz/libdriveio/src/tipcommon.h Changed

makemkv-oss-1.8.7.tar.gz/libdriveio/src/tipserver.cpp -> makemkv-oss-1.8.8.tar.gz/libdriveio/src/tipserver.cpp Changed

makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlVersion.cpp -> makemkv-oss-1.8.8.tar.gz/libebml/src/EbmlVersion.cpp Changed

makemkv-oss-1.8.7.tar.gz/libffabi/inc/lgpl/ffabi.h -> makemkv-oss-1.8.8.tar.gz/libffabi/inc/lgpl/ffabi.h Changed

@@ -1,7 +1,7 @@
 /*
     libMakeMKV - MKV multiplexer library
 
-    Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com>
+    Copyright (C) 2007-2014 GuinpinSoft inc <libmkv@makemkv.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -28,20 +28,12 @@
 #define __cdecl
 #endif
 
-typedef enum _FFM_CodecID {
-    FFM_CODEC_ID_AC3        = 0x15003,
-    FFM_CODEC_ID_DTS        = 0x15004,
-    FFM_CODEC_ID_FLAC       = 0x1500e,
-    FFM_CODEC_ID_MLP        = 0x1501f,
-    FFM_CODEC_ID_EAC3       = 0x1502b,
-    FFM_CODEC_ID_TRUEHD     = 0x1502f,
-    FFM_CODEC_ID_MAX_VALUE
-} FFM_CodecID;
-
 #define FFM_INPUT_BUFFER_PADDING_SIZE 16
+#define FFM_PROFILE_UNKNOWN 0xffffffff
+#define FFM_CODEC_FLAG_GLOBAL_HEADER 1
 
 typedef enum _FFM_AudioFormat {
-    FFM_AUDIO_FMT_UNKNOWN,
+    FFM_AUDIO_FMT_UNKNOWN=0,
     FFM_AUDIO_FMT_PCM_U8,
     FFM_AUDIO_FMT_PCM_S16,
     FFM_AUDIO_FMT_PCM_S32,
@@ -56,6 +48,13 @@
     FFM_AUDIO_FMT_MAX_VALUE
 } FFM_AudioFormat;
 
+typedef enum _FFM_MatrixEncoding {
+    FFM_MATRIX_ENCODING_NONE=0,
+    FFM_MATRIX_ENCODING_DOLBY,
+    FFM_MATRIX_ENCODING_DPLII,
+    FFM_MATRIX_ENCODING_NB
+} FFM_MatrixEncoding;
+
 #ifdef _MSC_VER
 #define ALIGN_PACKED
 #pragma pack(1)
@@ -71,8 +70,29 @@
     uint32_t    bits_per_sample;
     uint32_t    frame_size;
     uint64_t    channel_layout;
+    uint32_t    profile;
 } ALIGN_PACKED FFM_AudioInfo;
 
+typedef struct _FFM_CodecInfo {
+    const char*     name;
+    const char*     long_name;
+    const int*      sample_rates;
+    const uint64_t* channel_layouts;
+    uint32_t        id;
+    uint32_t        capabilities;
+    uint32_t        profiles_count;
+    uint32_t        sample_formats_count;
+    uint32_t        profiles_values[32];
+    const char*     profiles_names[32];
+    uint8_t         sample_formats[16];
+} ALIGN_PACKED FFM_CodecInfo;
+
+typedef struct _FFM_AudioEncodeInfo {
+    const uint8_t*  extradata;
+    uint32_t        extradata_size;
+    uint32_t        delay;
+    uint32_t        flags;
+} ALIGN_PACKED FFM_AudioEncodeInfo;
 
 #ifdef _MSC_VER
 #pragma pack()
@@ -87,6 +107,9 @@
 struct _FFM_AudioConvert;
 typedef struct _FFM_AudioConvert FFM_AudioConvert;
 
+struct _FFM_AudioMix;
+typedef struct _FFM_AudioMix FFM_AudioMix;
+
 typedef void  (__cdecl *ffm_log_callback_t)(void* ctx,void* ctx2,int level,char* text);
 typedef void* (__cdecl *ffm_memalign_t)(uintptr_t align, uintptr_t size);
 typedef void* (__cdecl *ffm_realloc_t)(void *ptr, uintptr_t size);
@@ -97,31 +120,37 @@
 #endif
 
 int __cdecl ffm_init(ffm_log_callback_t log_proc,void* log_context,ffm_memalign_t memalign_proc,ffm_realloc_t realloc_proc,ffm_free_t free_proc);
-uint32_t __cdecl ffm_avcodec_version(void);
+uint32_t __cdecl ffm_avcodec_version2(void);
 
-FFM_AudioDecodeContext* __cdecl ffm_audio_decode_init(void* logctx,FFM_CodecID id,FFM_AudioFormat fmt,const char* argp[],const uint8_t* CodecData,unsigned int CodecDataSize,unsigned int time_base);
+FFM_AudioDecodeContext* __cdecl ffm_audio_decode_init(void* logctx,const char* name,FFM_AudioFormat fmt,const char* argp[],const uint8_t* CodecData,unsigned int CodecDataSize,unsigned int time_base,unsigned int CodecFlags);
 int __cdecl ffm_audio_decode_close(FFM_AudioDecodeContext* ctx);
 int __cdecl ffm_audio_decode_put_data(FFM_AudioDecodeContext* ctx,const uint8_t* data,unsigned int size,int64_t pts);
 unsigned int __cdecl ffm_audio_decode_get_frame(FFM_AudioDecodeContext* ctx,int64_t* pts,const uint8_t* data[]);
 int __cdecl ffm_audio_decode_get_info(FFM_AudioDecodeContext* ctx,FFM_AudioInfo* info);
 
-FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,FFM_CodecID id,FFM_AudioFormat fmt,FFM_AudioInfo* info,const char* argp[],unsigned int time_base);
+FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* name,FFM_AudioFormat fmt,FFM_AudioInfo* info,const char* argp[],unsigned int time_base,unsigned int CodecFlags);
 int __cdecl ffm_audio_encode_close(FFM_AudioEncodeContext* ctx);
 int __cdecl ffm_audio_encode_put_frame(FFM_AudioEncodeContext* ctx,const uint8_t* frame_data[],unsigned int frame_size,unsigned int nb_samples,uint64_t pts);
 const uint8_t* __cdecl ffm_audio_encode_get_data(FFM_AudioEncodeContext* ctx,unsigned int *size,int64_t *pts);
-const uint8_t* __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,unsigned int *size);
+int __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncodeInfo* info);
 
-int __cdecl ffm_audio_check_codec_format(FFM_CodecID id,FFM_AudioFormat fmt,int encode);
+int __cdecl ffm_audio_get_codec_information(FFM_CodecInfo* info,const char* name,int encode);
 
 FFM_AudioConvert* __cdecl ffm_audio_convert_alloc(FFM_AudioFormat out_fmt,FFM_AudioFormat in_fmt,int channels);
 void __cdecl ffm_audio_convert_free(FFM_AudioConvert **ac);
 void __cdecl ffm_audio_convert(FFM_AudioConvert *ac, uint8_t *data_out[], const uint8_t* data_in[], int nb_samples);
 
+FFM_AudioMix* __cdecl ffm_audio_mix_alloc(void* logctx,uint64_t in_channel_layout, uint64_t out_channel_layout, const double* mix_levels, FFM_MatrixEncoding matrix_encoding);
+void __cdecl ffm_audio_mix_free(FFM_AudioMix **am_p);
+int __cdecl ffm_audio_mix(FFM_AudioMix *am, int32_t *src_data[], int nb_samples);
+
 int __cdecl ffm_mlp_read_syncframe(const uint8_t* data,unsigned int size,FFM_AudioInfo* info,uint32_t* bitrate);
 uint16_t __cdecl ffm_mlp_checksum16(const uint8_t *buf, unsigned int buf_size);
 
 int __cdecl ffm_mpa_decode_header(uint32_t hdr,FFM_AudioInfo* info,uint32_t* layer,uint32_t* frame_size,uint32_t* bitrate);
 
+int __cdecl ffm_get_channel_layout_string(char *buf,int buf_size,uint64_t channel_layout);
+
 #ifdef __cplusplus
 };
 #endif

makemkv-oss-1.8.7.tar.gz/libffabi/src/audio_convert.c -> makemkv-oss-1.8.8.tar.gz/libffabi/src/audio_convert.c Changed

@@ -22,15 +22,7 @@
 #include <stdint.h>
 #include <lgpl/ffabi.h>
 
-//#include "config.h"
 #include <libavutil/common.h>
-//#include "libavutil/libm.h"
-//#include "libavutil/log.h"
-//#include "libavutil/mem.h"
-//#include <libavutil/samplefmt.h>
-//#include "audio_convert.h"
-//#include "audio_data.h"
-//#include "dither.h"
 #include "internal.h"
 
 
@@ -49,26 +41,15 @@
                                       int channels);
 
 struct _FFM_AudioConvert {
-    //AVAudioResampleContext *avr;
-    //DitherContext *dc;
     enum AVSampleFormat in_fmt;
     enum AVSampleFormat out_fmt;
-    //int apply_map;
     int channels;
     int planes;
     int in_planar;
-    //int ptr_align;
-    //int samples_align;
-    //int has_optimized_func;
-    //const char *func_descr;
-    //const char *func_descr_generic;
     enum ConvFuncType func_type;
     conv_func_flat         *conv_flat;
-    //conv_func_flat         *conv_flat_generic;
     conv_func_interleave   *conv_interleave;
-    //conv_func_interleave   *conv_interleave_generic;
     conv_func_deinterleave *conv_deinterleave;
-    //conv_func_deinterleave *conv_deinterleave_generic;
 };
 
 static inline enum AVSampleFormat ac_get_packed_sample_fmt(enum AVSampleFormat fmt)
@@ -90,68 +71,28 @@
                                int ptr_align, int samples_align,
                                const char *descr, void *conv)
 {
-    //int found = 0;
-
     switch (ac->func_type) {
     case CONV_FUNC_TYPE_FLAT:
         if (ac_get_packed_sample_fmt(ac->in_fmt)  == in_fmt &&
             ac_get_packed_sample_fmt(ac->out_fmt) == out_fmt) {
             ac->conv_flat     = conv;
-            /*ac->func_descr    = descr;
-            ac->ptr_align     = ptr_align;
-            ac->samples_align = samples_align;
-            if (ptr_align == 1 && samples_align == 1) {
-                ac->conv_flat_generic  = conv;
-                ac->func_descr_generic = descr;
-            } else {
-                ac->has_optimized_func = 1;
-            }
-            found = 1;*/
         }
         break;
     case CONV_FUNC_TYPE_INTERLEAVE:
         if (ac->in_fmt == in_fmt && ac->out_fmt == out_fmt &&
             (!channels || ac->channels == channels)) {
             ac->conv_interleave = conv;
-            /*ac->func_descr      = descr;
-            ac->ptr_align       = ptr_align;
-            ac->samples_align   = samples_align;
-            if (ptr_align == 1 && samples_align == 1) {
-                ac->conv_interleave_generic = conv;
-                ac->func_descr_generic      = descr;
-            } else {
-                ac->has_optimized_func = 1;
-            }
-            found = 1;*/
         }
         break;
     case CONV_FUNC_TYPE_DEINTERLEAVE:
         if (ac->in_fmt == in_fmt && ac->out_fmt == out_fmt &&
             (!channels || ac->channels == channels)) {
             ac->conv_deinterleave = conv;
-            /*ac->func_descr        = descr;
-            ac->ptr_align         = ptr_align;
-            ac->samples_align     = samples_align;
-            if (ptr_align == 1 && samples_align == 1) {
-                ac->conv_deinterleave_generic = conv;
-                ac->func_descr_generic        = descr;
-            } else {
-                ac->has_optimized_func = 1;
-            }
-            found = 1;*/
         }
         break;
     }
-    /*if (found) {
-        av_log(ac->avr, AV_LOG_DEBUG, "audio_convert: found function: %-4s "
-               "to %-4s (%s)\n", av_get_sample_fmt_name(ac->in_fmt),
-               av_get_sample_fmt_name(ac->out_fmt), descr);
-    }*/
 }
 
-//        *(otype *)po = expr;                                                
-
-
 #define ac_sizeof(type) AC_SIZE_OF_##type
 
 #define AC_SIZE_OF_uint8_t              1
@@ -366,19 +307,17 @@
     SET_CONV_FUNC_GROUP_ID (AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBL)
 }
 
-void ffm_audio_convert_free(FFM_AudioConvert **ac)
+void __cdecl ffm_audio_convert_free(FFM_AudioConvert **ac)
 {
     if (!*ac)
         return;
-    //ff_dither_free(&(*ac)->dc);
     av_freep(ac);
 }
 
-FFM_AudioConvert *ff_ffm_audio_convert_alloc(//AVAudioResampleContext *avr,
+FFM_AudioConvert *ff_ffm_audio_convert_alloc(
                                      enum AVSampleFormat out_fmt,
                                      enum AVSampleFormat in_fmt,
-                                     int channels)//, int sample_rate,
-                                     //int apply_map)
+                                     int channels)
 {
     FFM_AudioConvert *ac;
     int in_planar, out_planar;
@@ -387,23 +326,9 @@
     if (!ac)
         return NULL;
 
-    //ac->avr      = avr;
     ac->out_fmt  = out_fmt;
     ac->in_fmt   = in_fmt;
     ac->channels = channels;
-    //ac->apply_map = apply_map;
-
-    /*if (avr->dither_method != AV_RESAMPLE_DITHER_NONE          &&
-        av_get_packed_sample_fmt(out_fmt) == AV_SAMPLE_FMT_S16 &&
-        av_get_bytes_per_sample(in_fmt) > 2) {
-        ac->dc = ff_dither_alloc(avr, out_fmt, in_fmt, channels, sample_rate,
-                                 apply_map);
-        if (!ac->dc) {
-            av_free(ac);
-            return NULL;
-        }
-        return ac;
-    }*/
 
     in_planar  = av_sample_fmt_is_planar(in_fmt);
     ac->in_planar = in_planar;
@@ -419,117 +344,27 @@
 
     set_generic_function(ac);
 
-    /*if (ARCH_ARM)
-        ff_audio_convert_init_arm(ac);
-    if (ARCH_X86)
-        ff_audio_convert_init_x86(ac);*/
-
     return ac;
 }
 
-void ffm_audio_convert(FFM_AudioConvert *ac, uint8_t *out_data[], const uint8_t* in_data[], int nb_samples)
+void __cdecl ffm_audio_convert(FFM_AudioConvert *ac, uint8_t *out_data[], const uint8_t* in_data[], int nb_samples)
 {
-    //int use_generic = 1;
     int len         = nb_samples;
     int p;
 
-#if 0
-    if (ac->dc) {
-        /* dithered conversion */
-        av_dlog(ac->avr, "%d samples - audio_convert: %s to %s (dithered)\n",
-                len, av_get_sample_fmt_name(ac->in_fmt),
-                av_get_sample_fmt_name(ac->out_fmt));
-
-        return ff_convert_dither(ac->dc, out, in);
-    }
-
-    /* determine whether to use the optimized function based on pointer and
-       samples alignment in both the input and output */
-    if (ac->has_optimized_func) {
-        int ptr_align     = FFMIN(in->ptr_align,     out->ptr_align);
-        int samples_align = FFMIN(in->samples_align, out->samples_align);
-        int aligned_len   = FFALIGN(len, ac->samples_align);
-        if (!(ptr_align % ac->ptr_align) && samples_align >= aligned_len) {
-            len = aligned_len;
-            use_generic = 0;
-        }
+    switch (ac->func_type) {
+    case CONV_FUNC_TYPE_FLAT: {
+        if (!ac->in_planar)
+            len *= ac->channels;
+        for (p = 0; p < ac->planes; p++)
+            ac->conv_flat(out_data[p], in_data[p], len);
+        break;
     }
-    av_dlog(ac->avr, "%d samples - audio_convert: %s to %s (%s)\n", len,
-            av_get_sample_fmt_name(ac->in_fmt),
-            av_get_sample_fmt_name(ac->out_fmt),
-            use_generic ? ac->func_descr_generic : ac->func_descr);
-
-    if (ac->apply_map) {
-        ChannelMapInfo *map = &ac->avr->ch_map_info;
-
-        if (!av_sample_fmt_is_planar(ac->out_fmt)) {
-            av_log(ac->avr, AV_LOG_ERROR, "cannot remap packed format during conversion\n");
-            return AVERROR(EINVAL);
-        }
-
-        if (map->do_remap) {
-            if (av_sample_fmt_is_planar(ac->in_fmt)) {
-                conv_func_flat *convert = use_generic ? ac->conv_flat_generic :
-                                                        ac->conv_flat;
-
-                for (p = 0; p < ac->planes; p++)
-                    if (map->channel_map[p] >= 0)
-                        convert(out->data[p], in->data[map->channel_map[p]], len);
-            } else {
-                uint8_t *data[AVRESAMPLE_MAX_CHANNELS];
-                conv_func_deinterleave *convert = use_generic ?
-                                                  ac->conv_deinterleave_generic :
-                                                  ac->conv_deinterleave;
-
-                for (p = 0; p < ac->channels; p++)
-                    data[map->input_map[p]] = out->data[p];
-
-                convert(data, in->data[0], len, ac->channels);
-            }
-        }
-        if (map->do_copy || map->do_zero) {
-            for (p = 0; p < ac->planes; p++) {
-                if (map->channel_copy[p])
-                    memcpy(out->data[p], out->data[map->channel_copy[p]],
-                           len * out->stride);
-                else if (map->channel_zero[p])
-                    av_samples_set_silence(&out->data[p], 0, len, 1, ac->out_fmt);
-            }
-        }
-    } else {
-#endif
-    {
-        switch (ac->func_type) {
-        case CONV_FUNC_TYPE_FLAT: {
-            if (!ac->in_planar)
-                len *= ac->channels;
-            /*if (use_generic) {
-                for (p = 0; p < ac->planes; p++)
-                    ac->conv_flat_generic(out->data[p], in->data[p], len);
-            } else*/ {
-                for (p = 0; p < ac->planes; p++)
-                    ac->conv_flat(out_data[p], in_data[p], len);
-            }
-            break;
-        }
-        case CONV_FUNC_TYPE_INTERLEAVE:
-            /*if (use_generic)
-                ac->conv_interleave_generic(out->data[0], in->data, len,
-                                            ac->channels);
-            else*/
-                ac->conv_interleave(out_data[0], in_data, len, ac->channels);
-            break;
-        case CONV_FUNC_TYPE_DEINTERLEAVE:
-            /*if (use_generic)
-                ac->conv_deinterleave_generic(out->data, in->data[0], len,
-                                              ac->channels);
-            else*/
-                ac->conv_deinterleave(out_data, in_data[0], len,
-                                      ac->channels);
-            break;
-        }
+    case CONV_FUNC_TYPE_INTERLEAVE:
+        ac->conv_interleave(out_data[0], in_data, len, ac->channels);
+        break;
+    case CONV_FUNC_TYPE_DEINTERLEAVE:
+        ac->conv_deinterleave(out_data, in_data[0], len, ac->channels);
+        break;
     }
-
-    //out->nb_samples = in->nb_samples;
-    //return 0;
 }

makemkv-oss-1.8.8.tar.gz/libffabi/src/audio_mix.c Added

@@ -0,0 +1,362 @@
+/*
+ * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+#include <lgpl/ffabi.h>
+
+#include <libavutil/common.h>
+#include <libavutil/samplefmt.h>
+#include <libavutil/log.h>
+#include "internal.h"
+
+struct _FFM_AudioMix {
+    uint64_t in_layout;
+    uint64_t out_layout;
+    int in_channels;
+    int out_channels;
+
+    int in_matrix_channels;
+    int out_matrix_channels;
+    int output_zero[FFM_AVRESAMPLE_MAX_CHANNELS];
+    int input_skip[FFM_AVRESAMPLE_MAX_CHANNELS];
+    int output_skip[FFM_AVRESAMPLE_MAX_CHANNELS];
+    int32_t *matrix_q30[FFM_AVRESAMPLE_MAX_CHANNELS];
+    int32_t   **matrix;
+};
+
+static int ff_audio_mix_set_matrix(FFM_AudioMix *am, const double *matrix, int stride,void* logctx);
+
+static void mix_any_s32_q30_c(int32_t **samples, int32_t **matrix, int len, int out_ch, int in_ch)
+{
+    int i, in, out;
+    int32_t temp[FFM_AVRESAMPLE_MAX_CHANNELS];
+    for (i = 0; i < len; i++) {
+        for (out = 0; out < out_ch; out++) {
+            int64_t sum; sum = 0;
+            for (in = 0; in < in_ch; in++)
+                sum += (samples[in][i] * ((int64_t)(matrix[out][in])));
+            temp[out] = av_clipl_int32(sum >> 30);
+        }
+        for (out = 0; out < out_ch; out++)
+            samples[out][i] = temp[out];
+    }
+}
+
+FFM_AudioMix* __cdecl ffm_audio_mix_alloc(void* logctx,uint64_t in_channel_layout, uint64_t out_channel_layout, const double* mix_levels, FFM_MatrixEncoding matrix_encoding)
+{
+    FFM_AudioMix *am;
+    int ret;
+
+    am = av_mallocz(sizeof(*am));
+    if (!am)
+        return NULL;
+
+    am->in_layout    = in_channel_layout;
+    am->out_layout   = out_channel_layout;
+    am->in_channels  = av_get_channel_layout_nb_channels(in_channel_layout);
+    am->out_channels = av_get_channel_layout_nb_channels(out_channel_layout);
+
+    {
+        double *matrix_dbl = av_mallocz(am->out_channels * am->in_channels *
+                                        sizeof(*matrix_dbl));
+        if (!matrix_dbl)
+            goto error;
+
+        ret = ff_avresample_build_matrix(in_channel_layout,
+                                      out_channel_layout,
+                                      mix_levels[0],//avr->center_mix_level,
+                                      mix_levels[1],//avr->surround_mix_level,
+                                      mix_levels[2],//avr->lfe_mix_level,
+                                      1,//avr->normalize_mix_level,
+                                      matrix_dbl,
+                                      am->in_channels,
+                                      matrix_encoding);
+        if (ret < 0) {
+            av_free(matrix_dbl);
+            goto error;
+        }
+
+        ret = ff_audio_mix_set_matrix(am, matrix_dbl, am->in_channels, logctx);
+        if (ret < 0) {
+            av_free(matrix_dbl);
+            goto error;
+        }
+
+        av_free(matrix_dbl);
+    }
+
+    return am;
+
+error:
+    av_free(am);
+    return NULL;
+}
+
+void __cdecl ffm_audio_mix_free(FFM_AudioMix **am_p)
+{
+    FFM_AudioMix *am;
+
+    if (!*am_p)
+        return;
+    am = *am_p;
+
+    if (am->matrix) {
+        av_free(am->matrix[0]);
+        am->matrix = NULL;
+    }
+    memset(am->matrix_q30, 0, sizeof(am->matrix_q30));
+
+    av_freep(am_p);
+}
+
+int __cdecl ffm_audio_mix(FFM_AudioMix *am, int32_t *src_data[], int nb_samples)
+{
+    int len = nb_samples;
+    int i, j;
+
+    if (am->in_matrix_channels && am->out_matrix_channels) {
+        int32_t **data;
+        int32_t *data0[FFM_AVRESAMPLE_MAX_CHANNELS];
+
+        if (am->out_matrix_channels < am->out_channels ||
+             am->in_matrix_channels <  am->in_channels) {
+            for (i = 0, j = 0; i < FFMAX(am->in_channels, am->out_channels); i++) {
+                if (am->input_skip[i] || am->output_skip[i] || am->output_zero[i])
+                    continue;
+                data0[j++] = src_data[i];
+            }
+            data = data0;
+        } else {
+            data = src_data;
+        }
+
+        mix_any_s32_q30_c(data, am->matrix, len, am->out_matrix_channels,
+                        am->in_matrix_channels);
+    }
+
+    if (am->out_matrix_channels < am->out_channels) {
+        for (i = 0; i < am->out_channels; i++)
+            if (am->output_zero[i])
+                memset(src_data[i],0,sizeof(int32_t)*len);
+    }
+
+    return 0;
+}
+
+static void reduce_matrix(FFM_AudioMix *am, const double *matrix, int stride)
+{
+    int i, o;
+
+    memset(am->output_zero, 0, sizeof(am->output_zero));
+    memset(am->input_skip,  0, sizeof(am->input_skip));
+    memset(am->output_skip, 0, sizeof(am->output_skip));
+
+    /* exclude output channels if they can be zeroed instead of mixed */
+    for (o = 0; o < am->out_channels; o++) {
+        int zero = 1;
+
+        /* check if the output is always silent */
+        for (i = 0; i < am->in_channels; i++) {
+            if (matrix[o * stride + i] != 0.0) {
+                zero = 0;
+                break;
+            }
+        }
+        /* check if the corresponding input channel makes a contribution to
+           any output channel */
+        if (o < am->in_channels) {
+            for (i = 0; i < am->out_channels; i++) {
+                if (matrix[i * stride + o] != 0.0) {
+                    zero = 0;
+                    break;
+                }
+            }
+        }
+        if (zero) {
+            am->output_zero[o] = 1;
+            am->out_matrix_channels--;
+        }
+    }
+    if (am->out_matrix_channels == 0) {
+        am->in_matrix_channels = 0;
+        return;
+    }
+
+    /* skip input channels that contribute fully only to the corresponding
+       output channel */
+    for (i = 0; i < FFMIN(am->in_channels, am->out_channels); i++) {
+        int skip = 1;
+
+        for (o = 0; o < am->out_channels; o++) {
+            int i0;
+            if ((o != i && matrix[o * stride + i] != 0.0) ||
+                (o == i && matrix[o * stride + i] != 1.0)) {
+                skip = 0;
+                break;
+            }
+            /* if the input contributes fully to the output, also check that no
+               other inputs contribute to this output */
+            if (o == i) {
+                for (i0 = 0; i0 < am->in_channels; i0++) {
+                    if (i0 != i && matrix[o * stride + i0] != 0.0) {
+                        skip = 0;
+                        break;
+                    }
+                }
+            }
+        }
+        if (skip) {
+            am->input_skip[i] = 1;
+            am->in_matrix_channels--;
+        }
+    }
+    /* skip input channels that do not contribute to any output channel */
+    for (; i < am->in_channels; i++) {
+        int contrib = 0;
+
+        for (o = 0; o < am->out_channels; o++) {
+            if (matrix[o * stride + i] != 0.0) {
+                contrib = 1;
+                break;
+            }
+        }
+        if (!contrib) {
+            am->input_skip[i] = 1;
+            am->in_matrix_channels--;
+        }
+    }
+    if (am->in_matrix_channels == 0) {
+        am->out_matrix_channels = 0;
+        return;
+    }
+
+    /* skip output channels that only get full contribution from the
+       corresponding input channel */
+    for (o = 0; o < FFMIN(am->in_channels, am->out_channels); o++) {
+        int skip = 1;
+        int o0;
+
+        for (i = 0; i < am->in_channels; i++) {
+            if ((o != i && matrix[o * stride + i] != 0.0) ||
+                (o == i && matrix[o * stride + i] != 1.0)) {
+                skip = 0;
+                break;
+            }
+        }
+        /* check if the corresponding input channel makes a contribution to
+           any other output channel */
+        i = o;
+        for (o0 = 0; o0 < am->out_channels; o0++) {
+            if (o0 != i && matrix[o0 * stride + i] != 0.0) {
+                skip = 0;
+                break;
+            }
+        }
+        if (skip) {
+            am->output_skip[o] = 1;
+            am->out_matrix_channels--;
+        }
+    }
+    if (am->out_matrix_channels == 0) {
+        am->in_matrix_channels = 0;
+        return;
+    }
+}
+
+static const AVClass av_audio_mix_log_context_class = {
+    .class_name = "FFM_AudioMix",
+    .item_name  = av_default_item_name,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+static int ff_audio_mix_set_matrix(FFM_AudioMix *am, const double *matrix, int stride,void* logctx)
+{
+    int i, o, i0, o0;
+    char in_layout_name[128];
+    char out_layout_name[128];
+    ffabi_Logger flog = { &av_audio_mix_log_context_class , logctx };
+
+    if ( am->in_channels <= 0 ||  am->in_channels > FFM_AVRESAMPLE_MAX_CHANNELS ||
+        am->out_channels <= 0 || am->out_channels > FFM_AVRESAMPLE_MAX_CHANNELS) {
+        av_log(&flog, AV_LOG_ERROR, "Invalid channel counts\n");
+        return AVERROR(EINVAL);
+    }
+
+    if (am->matrix) {
+        av_free(am->matrix[0]);
+        am->matrix = NULL;
+    }
+
+    am->in_matrix_channels  = am->in_channels;
+    am->out_matrix_channels = am->out_channels;
+
+    reduce_matrix(am, matrix, stride);
+
+#define CONVERT_MATRIX(type, expr)                                          \
+    am->matrix_## type[0] = (int32_t*)av_mallocz(am->out_matrix_channels *  \
+                                       am->in_matrix_channels  *            \
+                                       sizeof(*am->matrix_## type[0]));     \
+    if (!am->matrix_## type[0])                                             \
+        return AVERROR(ENOMEM);                                             \
+    for (o = 0, o0 = 0; o < am->out_channels; o++) {                        \
+        if (am->output_zero[o] || am->output_skip[o])                       \
+            continue;                                                       \
+        if (o0 > 0)                                                         \
+            am->matrix_## type[o0] = am->matrix_## type[o0 - 1] +           \
+                                     am->in_matrix_channels;                \
+        for (i = 0, i0 = 0; i < am->in_channels; i++) {                     \
+            double v;                                                       \
+            if (am->input_skip[i])                                          \
+                continue;                                                   \
+            v = matrix[o * stride + i];                                     \
+            am->matrix_## type[o0][i0] = expr;                              \
+            i0++;                                                           \
+        }                                                                   \
+        o0++;                                                               \
+    }                                                                       \
+    am->matrix = am->matrix_## type;
+
+    if (am->in_matrix_channels && am->out_matrix_channels) {
+        CONVERT_MATRIX(q30, av_clipl_int32(llrint(1073741824.0 * v)))
+    }
+
+    av_get_channel_layout_string(in_layout_name, sizeof(in_layout_name),
+                                 am->in_channels, am->in_layout);
+    av_get_channel_layout_string(out_layout_name, sizeof(out_layout_name),
+                                 am->out_channels, am->out_layout);
+    av_log(&flog, AV_LOG_DEBUG, "audio_mix: %s to %s\n",
+           in_layout_name, out_layout_name);
+    av_log(&flog, AV_LOG_DEBUG, "matrix size: %d x %d\n",
+           am->in_matrix_channels, am->out_matrix_channels);
+    for (o = 0; o < am->out_channels; o++) {
+        for (i = 0; i < am->in_channels; i++) {
+            if (am->output_zero[o])
+                av_log(&flog, AV_LOG_DEBUG, "  (ZERO)");
+            else if (am->input_skip[i] || am->output_skip[o])
+                av_log(&flog, AV_LOG_DEBUG, "  (SKIP)");
+            else
+                av_log(&flog, AV_LOG_DEBUG, "  %0.3f ",
+                       matrix[o * am->in_channels + i]);
+        }
+        av_log(&flog, AV_LOG_DEBUG, "\n");
+    }
+
+    return 0;
+}

makemkv-oss-1.8.8.tar.gz/libffabi/src/audio_mix_matrix.c Added

@@ -0,0 +1,285 @@
+/*
+ * Copyright (C) 2011 Michael Niedermayer (michaelni@gmx.at)
+ * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+#include <lgpl/ffabi.h>
+
+#include <libavutil/common.h>
+#include "internal.h"
+
+/* channel positions */
+#define FRONT_LEFT              0
+#define FRONT_RIGHT             1
+#define FRONT_CENTER            2
+#define LOW_FREQUENCY           3
+#define BACK_LEFT               4
+#define BACK_RIGHT              5
+#define FRONT_LEFT_OF_CENTER    6
+#define FRONT_RIGHT_OF_CENTER   7
+#define BACK_CENTER             8
+#define SIDE_LEFT               9
+#define SIDE_RIGHT             10
+#define TOP_CENTER             11
+#define TOP_FRONT_LEFT         12
+#define TOP_FRONT_CENTER       13
+#define TOP_FRONT_RIGHT        14
+#define TOP_BACK_LEFT          15
+#define TOP_BACK_CENTER        16
+#define TOP_BACK_RIGHT         17
+#define STEREO_LEFT            29
+#define STEREO_RIGHT           30
+#define WIDE_LEFT              31
+#define WIDE_RIGHT             32
+#define SURROUND_DIRECT_LEFT   33
+#define SURROUND_DIRECT_RIGHT  34
+#define LOW_FREQUENCY_2        35
+
+#define SQRT3_2      1.22474487139158904909  /* sqrt(3/2) */
+
+static av_always_inline int even(uint64_t layout)
+{
+    return (!layout || (layout & (layout - 1)));
+}
+
+static int sane_layout(uint64_t layout)
+{
+    /* check that there is at least 1 front speaker */
+    if (!(layout & AV_CH_LAYOUT_SURROUND))
+        return 0;
+
+    /* check for left/right symmetry */
+    if (!even(layout & (AV_CH_FRONT_LEFT           | AV_CH_FRONT_RIGHT))           ||
+        !even(layout & (AV_CH_SIDE_LEFT            | AV_CH_SIDE_RIGHT))            ||
+        !even(layout & (AV_CH_BACK_LEFT            | AV_CH_BACK_RIGHT))            ||
+        !even(layout & (AV_CH_FRONT_LEFT_OF_CENTER | AV_CH_FRONT_RIGHT_OF_CENTER)) ||
+        !even(layout & (AV_CH_TOP_FRONT_LEFT       | AV_CH_TOP_FRONT_RIGHT))       ||
+        !even(layout & (AV_CH_TOP_BACK_LEFT        | AV_CH_TOP_BACK_RIGHT))        ||
+        !even(layout & (AV_CH_STEREO_LEFT          | AV_CH_STEREO_RIGHT))          ||
+        !even(layout & (AV_CH_WIDE_LEFT            | AV_CH_WIDE_RIGHT))            ||
+        !even(layout & (AV_CH_SURROUND_DIRECT_LEFT | AV_CH_SURROUND_DIRECT_RIGHT)))
+        return 0;
+
+    return 1;
+}
+
+int ff_avresample_build_matrix(uint64_t in_layout, uint64_t out_layout,
+                            double center_mix_level, double surround_mix_level,
+                            double lfe_mix_level, int normalize,
+                            double *matrix_out, int stride,
+                            FFM_MatrixEncoding matrix_encoding)
+{
+    int i, j, out_i, out_j;
+    double matrix[64][64] = {{0}};
+    int64_t unaccounted;
+    double maxcoef = 0;
+    int in_channels, out_channels;
+
+    if ((out_layout & AV_CH_LAYOUT_STEREO_DOWNMIX) == AV_CH_LAYOUT_STEREO_DOWNMIX) {
+        out_layout = AV_CH_LAYOUT_STEREO;
+    }
+
+    unaccounted = in_layout & ~out_layout;
+
+    in_channels  = av_get_channel_layout_nb_channels( in_layout);
+    out_channels = av_get_channel_layout_nb_channels(out_layout);
+
+    memset(matrix_out, 0, out_channels * stride * sizeof(*matrix_out));
+
+    /* check if layouts are supported */
+    if (!in_layout || in_channels > FFM_AVRESAMPLE_MAX_CHANNELS)
+        return AVERROR(EINVAL);
+    if (!out_layout || out_channels > FFM_AVRESAMPLE_MAX_CHANNELS)
+        return AVERROR(EINVAL);
+
+    /* check if layouts are unbalanced or abnormal */
+    if (!sane_layout(in_layout) || !sane_layout(out_layout))
+        return AVERROR_PATCHWELCOME;
+
+    /* route matching input/output channels */
+    for (i = 0; i < 64; i++) {
+        if (in_layout & out_layout & (1ULL << i))
+            matrix[i][i] = 1.0;
+    }
+
+    /* mix front center to front left/right */
+    if (unaccounted & AV_CH_FRONT_CENTER) {
+        if ((out_layout & AV_CH_LAYOUT_STEREO) == AV_CH_LAYOUT_STEREO) {
+            matrix[FRONT_LEFT ][FRONT_CENTER] += M_SQRT1_2;
+            matrix[FRONT_RIGHT][FRONT_CENTER] += M_SQRT1_2;
+        } else
+            return AVERROR_PATCHWELCOME;
+    }
+    /* mix front left/right to center */
+    if (unaccounted & AV_CH_LAYOUT_STEREO) {
+        if (out_layout & AV_CH_FRONT_CENTER) {
+            matrix[FRONT_CENTER][FRONT_LEFT ] += M_SQRT1_2;
+            matrix[FRONT_CENTER][FRONT_RIGHT] += M_SQRT1_2;
+            /* mix left/right/center to center */
+            if (in_layout & AV_CH_FRONT_CENTER)
+                matrix[FRONT_CENTER][FRONT_CENTER] = center_mix_level * M_SQRT2;
+        } else
+            return AVERROR_PATCHWELCOME;
+    }
+    /* mix back center to back, side, or front */
+    if (unaccounted & AV_CH_BACK_CENTER) {
+        if (out_layout & AV_CH_BACK_LEFT) {
+            matrix[BACK_LEFT ][BACK_CENTER] += M_SQRT1_2;
+            matrix[BACK_RIGHT][BACK_CENTER] += M_SQRT1_2;
+        } else if (out_layout & AV_CH_SIDE_LEFT) {
+            matrix[SIDE_LEFT ][BACK_CENTER] += M_SQRT1_2;
+            matrix[SIDE_RIGHT][BACK_CENTER] += M_SQRT1_2;
+        } else if (out_layout & AV_CH_FRONT_LEFT) {
+            if (matrix_encoding == FFM_MATRIX_ENCODING_DOLBY ||
+                matrix_encoding == FFM_MATRIX_ENCODING_DPLII) {
+                if (unaccounted & (AV_CH_BACK_LEFT | AV_CH_SIDE_LEFT)) {
+                    matrix[FRONT_LEFT ][BACK_CENTER] -= surround_mix_level * M_SQRT1_2;
+                    matrix[FRONT_RIGHT][BACK_CENTER] += surround_mix_level * M_SQRT1_2;
+                } else {
+                    matrix[FRONT_LEFT ][BACK_CENTER] -= surround_mix_level;
+                    matrix[FRONT_RIGHT][BACK_CENTER] += surround_mix_level;
+                }
+            } else {
+                matrix[FRONT_LEFT ][BACK_CENTER] += surround_mix_level * M_SQRT1_2;
+                matrix[FRONT_RIGHT][BACK_CENTER] += surround_mix_level * M_SQRT1_2;
+            }
+        } else if (out_layout & AV_CH_FRONT_CENTER) {
+            matrix[FRONT_CENTER][BACK_CENTER] += surround_mix_level * M_SQRT1_2;
+        } else
+            return AVERROR_PATCHWELCOME;
+    }
+    /* mix back left/right to back center, side, or front */
+    if (unaccounted & AV_CH_BACK_LEFT) {
+        if (out_layout & AV_CH_BACK_CENTER) {
+            matrix[BACK_CENTER][BACK_LEFT ] += M_SQRT1_2;
+            matrix[BACK_CENTER][BACK_RIGHT] += M_SQRT1_2;
+        } else if (out_layout & AV_CH_SIDE_LEFT) {
+            /* if side channels do not exist in the input, just copy back
+               channels to side channels, otherwise mix back into side */
+            if (in_layout & AV_CH_SIDE_LEFT) {
+                matrix[SIDE_LEFT ][BACK_LEFT ] += M_SQRT1_2;
+                matrix[SIDE_RIGHT][BACK_RIGHT] += M_SQRT1_2;
+            } else {
+                matrix[SIDE_LEFT ][BACK_LEFT ] += 1.0;
+                matrix[SIDE_RIGHT][BACK_RIGHT] += 1.0;
+            }
+        } else if (out_layout & AV_CH_FRONT_LEFT) {
+            if (matrix_encoding == FFM_MATRIX_ENCODING_DOLBY) {
+                matrix[FRONT_LEFT ][BACK_LEFT ] -= surround_mix_level * M_SQRT1_2;
+                matrix[FRONT_LEFT ][BACK_RIGHT] -= surround_mix_level * M_SQRT1_2;
+                matrix[FRONT_RIGHT][BACK_LEFT ] += surround_mix_level * M_SQRT1_2;
+                matrix[FRONT_RIGHT][BACK_RIGHT] += surround_mix_level * M_SQRT1_2;
+            } else if (matrix_encoding == FFM_MATRIX_ENCODING_DPLII) {
+                matrix[FRONT_LEFT ][BACK_LEFT ] -= surround_mix_level * SQRT3_2;
+                matrix[FRONT_LEFT ][BACK_RIGHT] -= surround_mix_level * M_SQRT1_2;
+                matrix[FRONT_RIGHT][BACK_LEFT ] += surround_mix_level * M_SQRT1_2;
+                matrix[FRONT_RIGHT][BACK_RIGHT] += surround_mix_level * SQRT3_2;
+            } else {
+                matrix[FRONT_LEFT ][BACK_LEFT ] += surround_mix_level;
+                matrix[FRONT_RIGHT][BACK_RIGHT] += surround_mix_level;
+            }
+        } else if (out_layout & AV_CH_FRONT_CENTER) {
+            matrix[FRONT_CENTER][BACK_LEFT ] += surround_mix_level * M_SQRT1_2;
+            matrix[FRONT_CENTER][BACK_RIGHT] += surround_mix_level * M_SQRT1_2;
+        } else
+            return AVERROR_PATCHWELCOME;
+    }
+    /* mix side left/right into back or front */
+    if (unaccounted & AV_CH_SIDE_LEFT) {
+        if (out_layout & AV_CH_BACK_LEFT) {
+            /* if back channels do not exist in the input, just copy side
+               channels to back channels, otherwise mix side into back */
+            if (in_layout & AV_CH_BACK_LEFT) {
+                matrix[BACK_LEFT ][SIDE_LEFT ] += M_SQRT1_2;
+                matrix[BACK_RIGHT][SIDE_RIGHT] += M_SQRT1_2;
+            } else {
+                matrix[BACK_LEFT ][SIDE_LEFT ] += 1.0;
+                matrix[BACK_RIGHT][SIDE_RIGHT] += 1.0;
+            }
+        } else if (out_layout & AV_CH_BACK_CENTER) {
+            matrix[BACK_CENTER][SIDE_LEFT ] += M_SQRT1_2;
+            matrix[BACK_CENTER][SIDE_RIGHT] += M_SQRT1_2;
+        } else if (out_layout & AV_CH_FRONT_LEFT) {
+            if (matrix_encoding == FFM_MATRIX_ENCODING_DOLBY) {
+                matrix[FRONT_LEFT ][SIDE_LEFT ] -= surround_mix_level * M_SQRT1_2;
+                matrix[FRONT_LEFT ][SIDE_RIGHT] -= surround_mix_level * M_SQRT1_2;
+                matrix[FRONT_RIGHT][SIDE_LEFT ] += surround_mix_level * M_SQRT1_2;
+                matrix[FRONT_RIGHT][SIDE_RIGHT] += surround_mix_level * M_SQRT1_2;
+            } else if (matrix_encoding == FFM_MATRIX_ENCODING_DPLII) {
+                matrix[FRONT_LEFT ][SIDE_LEFT ] -= surround_mix_level * SQRT3_2;
+                matrix[FRONT_LEFT ][SIDE_RIGHT] -= surround_mix_level * M_SQRT1_2;
+                matrix[FRONT_RIGHT][SIDE_LEFT ] += surround_mix_level * M_SQRT1_2;
+                matrix[FRONT_RIGHT][SIDE_RIGHT] += surround_mix_level * SQRT3_2;
+            } else {
+                matrix[FRONT_LEFT ][SIDE_LEFT ] += surround_mix_level;
+                matrix[FRONT_RIGHT][SIDE_RIGHT] += surround_mix_level;
+            }
+        } else if (out_layout & AV_CH_FRONT_CENTER) {
+            matrix[FRONT_CENTER][SIDE_LEFT ] += surround_mix_level * M_SQRT1_2;
+            matrix[FRONT_CENTER][SIDE_RIGHT] += surround_mix_level * M_SQRT1_2;
+        } else
+            return AVERROR_PATCHWELCOME;
+    }
+    /* mix left-of-center/right-of-center into front left/right or center */
+    if (unaccounted & AV_CH_FRONT_LEFT_OF_CENTER) {
+        if (out_layout & AV_CH_FRONT_LEFT) {
+            matrix[FRONT_LEFT ][FRONT_LEFT_OF_CENTER ] += 1.0;
+            matrix[FRONT_RIGHT][FRONT_RIGHT_OF_CENTER] += 1.0;
+        } else if (out_layout & AV_CH_FRONT_CENTER) {
+            matrix[FRONT_CENTER][FRONT_LEFT_OF_CENTER ] += M_SQRT1_2;
+            matrix[FRONT_CENTER][FRONT_RIGHT_OF_CENTER] += M_SQRT1_2;
+        } else
+            return AVERROR_PATCHWELCOME;
+    }
+    /* mix LFE into front left/right or center */
+    if (unaccounted & AV_CH_LOW_FREQUENCY) {
+        if (out_layout & AV_CH_FRONT_CENTER) {
+            matrix[FRONT_CENTER][LOW_FREQUENCY] += lfe_mix_level;
+        } else if (out_layout & AV_CH_FRONT_LEFT) {
+            matrix[FRONT_LEFT ][LOW_FREQUENCY] += lfe_mix_level * M_SQRT1_2;
+            matrix[FRONT_RIGHT][LOW_FREQUENCY] += lfe_mix_level * M_SQRT1_2;
+        } else
+            return AVERROR_PATCHWELCOME;
+    }
+
+    /* transfer internal matrix to output matrix and calculate maximum
+       per-channel coefficient sum */
+    for (out_i = i = 0; out_i < out_channels && i < 64; i++) {
+        double sum = 0;
+        for (out_j = j = 0; out_j < in_channels && j < 64; j++) {
+            matrix_out[out_i * stride + out_j] = matrix[i][j];
+            sum += fabs(matrix[i][j]);
+            if (in_layout & (1ULL << j))
+                out_j++;
+        }
+        maxcoef = FFMAX(maxcoef, sum);
+        if (out_layout & (1ULL << i))
+            out_i++;
+    }
+
+    /* normalize */
+    if (normalize && maxcoef > 1.0) {
+        for (i = 0; i < out_channels; i++)
+            for (j = 0; j < in_channels; j++)
+                matrix_out[i * stride + j] /= maxcoef;
+    }
+
+    return 0;
+}

makemkv-oss-1.8.7.tar.gz/libffabi/src/ffabi.c -> makemkv-oss-1.8.8.tar.gz/libffabi/src/ffabi.c Changed

@@ -1,7 +1,7 @@
 /*
     libMakeMKV - MKV multiplexer library
 
-    Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com>
+    Copyright (C) 2007-2014 GuinpinSoft inc <libmkv@makemkv.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -63,6 +63,9 @@
             if (!strcmp(pclass->class_name,"AVCodecContext")) {
                 ctx2 = ((AVCodecContext*)ptr)->opaque;
             }
+            if (!strcmp(pclass->class_name,"FFM_AudioMix")) {
+                ctx2 = ((ffabi_Logger*)ptr)->ctx2;
+            }
         }
     }
 
@@ -87,26 +90,11 @@
     return 0;
 }
 
-uint32_t __cdecl ffm_avcodec_version(void)
+uint32_t __cdecl ffm_avcodec_version2(void)
 {
     return avcodec_version();
 }
 
-static enum AVCodecID translate_codec_id(FFM_CodecID id)
-{
-    enum AVCodecID r;
-
-    switch(id) {
-    case FFM_CODEC_ID_AC3 : r = AV_CODEC_ID_AC3; break;
-    case FFM_CODEC_ID_DTS : r = AV_CODEC_ID_DTS; break;
-    case FFM_CODEC_ID_FLAC : r = AV_CODEC_ID_FLAC; break;
-    case FFM_CODEC_ID_MLP : r = AV_CODEC_ID_MLP; break;
-    case FFM_CODEC_ID_TRUEHD : r = AV_CODEC_ID_TRUEHD; break;
-    default : r=AV_CODEC_ID_NONE; break;
-    }
-    return r;
-}
-
 static enum AVSampleFormat translate_sample_fmt(FFM_AudioFormat fmt)
 {
     enum AVSampleFormat r;
@@ -137,7 +125,7 @@
     int                     have_frame;
 };
 
-FFM_AudioDecodeContext* __cdecl ffm_audio_decode_init(void* logctx,FFM_CodecID id,FFM_AudioFormat fmt,const char* argp[],const uint8_t* CodecData,unsigned int CodecDataSize,unsigned int time_base)
+FFM_AudioDecodeContext* __cdecl ffm_audio_decode_init(void* logctx,const char* name,FFM_AudioFormat fmt,const char* argp[],const uint8_t* CodecData,unsigned int CodecDataSize,unsigned int time_base,unsigned int CodecFlags)
 {
     AVDictionary *opts = NULL;
     FFM_AudioDecodeContext* ctx;
@@ -148,7 +136,7 @@
         return NULL;
     }
 
-    ctx->codec = avcodec_find_decoder(translate_codec_id(id));
+    ctx->codec = avcodec_find_decoder_by_name(name);
     if (!ctx->codec) {
         ffm_audio_decode_close(ctx);
         return NULL;
@@ -242,7 +230,7 @@
         if (ctx->frame->format != ctx->avctx->sample_fmt) { cold(); return -1; }
         if (ctx->frame->format != ctx->avctx->request_sample_fmt) { cold(); return -1; }
         if (ctx->nb_samples) {
-            if (ctx->nb_samples != ctx->frame->nb_samples) { cold(); return -1; }
+            if (ctx->nb_samples < ctx->frame->nb_samples) { cold(); return -1; }
         } else {
             cold();
             ctx->nb_samples = ctx->frame->nb_samples;
@@ -270,7 +258,7 @@
         }
     }
 
-    return ctx->frame->linesize[0];
+    return ctx->frame->nb_samples;
 }
 
 int __cdecl ffm_audio_decode_get_info(FFM_AudioDecodeContext* ctx,FFM_AudioInfo* info)
@@ -280,6 +268,7 @@
     info->channel_layout = ctx->avctx->channel_layout;
     info->frame_size = ctx->nb_samples;
     info->bits_per_sample = ctx->avctx->bits_per_raw_sample;
+    info->profile = ctx->avctx->profile;
     return 0;
 }
 
@@ -293,7 +282,7 @@
 };
 
 
-FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,FFM_CodecID id,FFM_AudioFormat fmt,FFM_AudioInfo* info,const char* argp[],unsigned int time_base)
+FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* name,FFM_AudioFormat fmt,FFM_AudioInfo* info,const char* argp[],unsigned int time_base,unsigned int CodecFlags)
 {
     AVDictionary *opts = NULL;
     FFM_AudioEncodeContext* ctx;
@@ -308,7 +297,7 @@
     ctx->pck.data=NULL;
     ctx->pck.size=0;
 
-    ctx->codec = avcodec_find_encoder(translate_codec_id(id));
+    ctx->codec = avcodec_find_encoder_by_name(name);
     if (!ctx->codec) {
         ffm_audio_encode_close(ctx);
         return NULL;
@@ -331,6 +320,11 @@
     ctx->avctx->channels = info->channels;
     ctx->avctx->bits_per_raw_sample = info->bits_per_sample;
     ctx->avctx->channel_layout = info->channel_layout;
+    ctx->avctx->profile = (info->profile != FFM_PROFILE_UNKNOWN) ?
+        info->profile : FF_PROFILE_UNKNOWN;
+
+    if ((CodecFlags&FFM_CODEC_FLAG_GLOBAL_HEADER)!=0)
+        ctx->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
 
     if (argp) {
         for (i=0;argp[i];i+=2) {
@@ -345,8 +339,8 @@
     }
     av_dict_free(&opts);
 
-    ctx->avctx->delay = 0;
     info->frame_size = ctx->avctx->frame_size;
+    info->profile = ctx->avctx->profile;
 
     ctx->frame = avcodec_alloc_frame();
     if (!ctx->frame) {
@@ -429,42 +423,76 @@
     return ctx->pck.data;
 }
 
-const uint8_t* __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,unsigned int *size)
+int __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncodeInfo* info)
 {
-    *size = ctx->avctx->extradata_size;
-    return ctx->avctx->extradata;
+    info->extradata = (const uint8_t*)ctx->avctx->extradata;
+    info->extradata_size = ctx->avctx->extradata_size;
+    info->delay = (int32_t)ctx->avctx->delay;
+    info->flags = 0;
+
+    if ((ctx->avctx->flags&CODEC_FLAG_GLOBAL_HEADER)!=0)
+        info->flags |= FFM_CODEC_FLAG_GLOBAL_HEADER;
+
+    return 0;
 }
 
-int __cdecl ffm_audio_check_codec_format(FFM_CodecID id,FFM_AudioFormat fmt,int encode)
+static FFM_AudioFormat back_translate_sample_fmt(enum AVSampleFormat fmt)
+{
+    int i;
+
+    for (i=0;i<FFM_AUDIO_FMT_MAX_VALUE;i++) {
+        if (fmt==translate_sample_fmt((FFM_AudioFormat)i)) {
+            return (FFM_AudioFormat)i;
+        }
+    }
+    return FFM_AUDIO_FMT_UNKNOWN;
+}
+
+int __cdecl ffm_audio_get_codec_information(FFM_CodecInfo* info,const char* name,int encode)
 {
     AVCodec* codec;
-    enum AVSampleFormat sfmt = translate_sample_fmt(fmt);
-    int i = 0;
+    int i;
 
-    if (sfmt==AV_SAMPLE_FMT_NONE) return -4;
+    memset(info,0,sizeof(*info));
 
     if (encode) {
-        codec = avcodec_find_encoder(translate_codec_id(id));
+        codec = avcodec_find_encoder_by_name(name);
     } else {
-        codec = avcodec_find_decoder(translate_codec_id(id));
+        codec = avcodec_find_decoder_by_name(name);
     }
 
     if (!codec) {
         return -1;
     }
 
-    if (!codec->sample_fmts) {
-        return -2;
+    info->name = codec->name;
+    info->long_name = codec->long_name;
+    info->sample_rates = codec->supported_samplerates;
+    info->channel_layouts = codec->channel_layouts;
+    info->id = codec->id;
+    info->capabilities = codec->capabilities;
+    if (codec->profiles) {
+        for (i=0;i<32;i++) {
+            if (codec->profiles[i].profile==FF_PROFILE_UNKNOWN)
+                break;
+            info->profiles_names[i]=codec->profiles[i].name;
+            info->profiles_values[i]=codec->profiles[i].profile;
+            info->profiles_count = i+1;
+        }
     }
-
-    while(codec->sample_fmts[i]>0) {
-        if (codec->sample_fmts[i++] == sfmt) return 0;
+    if (codec->sample_fmts) {
+        for (i=0;i<16;i++) {
+            if (codec->sample_fmts[i]==AV_SAMPLE_FMT_NONE)
+                break;
+            info->sample_formats[i]=(uint8_t)back_translate_sample_fmt(codec->sample_fmts[i]);
+            info->sample_formats_count = i+1;
+        }
     }
 
-    return -3;
+    return 0;
 }
 
-FFM_AudioConvert *ffm_audio_convert_alloc(FFM_AudioFormat out_fmt,FFM_AudioFormat in_fmt,int channels)
+FFM_AudioConvert* __cdecl ffm_audio_convert_alloc(FFM_AudioFormat out_fmt,FFM_AudioFormat in_fmt,int channels)
 {
     return ff_ffm_audio_convert_alloc(
         translate_sample_fmt(out_fmt),
@@ -567,3 +595,9 @@
     return 0;
 }
 
+int __cdecl ffm_get_channel_layout_string(char *buf,int buf_size,uint64_t channel_layout)
+{
+    av_get_channel_layout_string(buf,buf_size,-1,channel_layout);
+    return 0;
+}
+

makemkv-oss-1.8.7.tar.gz/libffabi/src/ffabicfg.h.in -> makemkv-oss-1.8.8.tar.gz/libffabi/src/ffabicfg.h.in Changed

makemkv-oss-1.8.7.tar.gz/libffabi/src/internal.h -> makemkv-oss-1.8.8.tar.gz/libffabi/src/internal.h Changed

@@ -1,7 +1,7 @@
 /*
     libMakeMKV - MKV multiplexer library
 
-    Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com>
+    Copyright (C) 2007-2014 GuinpinSoft inc <libmkv@makemkv.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -23,16 +23,32 @@
 
 #include <libavutil/samplefmt.h>
 #include <libavutil/mem.h>
+#include <libavutil/log.h>
 #include <libavcodec/avcodec.h>
 #include <libavcodec/version.h>
 
 static const enum AVSampleFormat AV_SAMPLE_FMT_S24 = AV_SAMPLE_FMT_NB + 1;
 
+typedef struct _ffabi_Logger {
+    const AVClass*  av_class;
+    void*           ctx2;
+} ffabi_Logger;
+
+
 FFM_AudioConvert *ff_ffm_audio_convert_alloc(
                                      enum AVSampleFormat out_fmt,
                                      enum AVSampleFormat in_fmt,
                                      int channels);
 
+#define FFM_AVRESAMPLE_MAX_CHANNELS 32
+
+int ff_avresample_build_matrix(uint64_t in_layout, uint64_t out_layout,
+                            double center_mix_level, double surround_mix_level,
+                            double lfe_mix_level, int normalize,
+                            double *matrix_out, int stride,
+                            FFM_MatrixEncoding matrix_encoding);
+
+
 void ffabi_ff_mlp_init_crc(void);
 
 void *ffabi_memalign(size_t align, size_t size);
@@ -51,9 +67,6 @@
 
 #ifndef FFABI_HAVE_AV_CODEC_ID_NAMES
 #define AV_CODEC_ID_NONE CODEC_ID_NONE
-#define AV_CODEC_ID_AC3 CODEC_ID_AC3
-#define AV_CODEC_ID_DTS CODEC_ID_DTS
-#define AV_CODEC_ID_FLAC CODEC_ID_FLAC
 #define AV_CODEC_ID_MLP CODEC_ID_MLP
 #define AV_CODEC_ID_TRUEHD CODEC_ID_TRUEHD
 #endif
@@ -76,4 +89,8 @@
                         char *line, int line_size, int *print_prefix);
 #endif
 
+#ifdef FFABI_HAVE_AVUTIL_CHANNEL_LAYOUT_H
+#include <libavutil/channel_layout.h>
+#endif
+
 #endif /* FFABI_INTERNAL_H */

makemkv-oss-1.8.7.tar.gz/libmakemkv/inc/lgpl/cassert -> makemkv-oss-1.8.8.tar.gz/libmakemkv/inc/lgpl/cassert Changed

makemkv-oss-1.8.7.tar.gz/libmakemkv/inc/lgpl/smem.h -> makemkv-oss-1.8.8.tar.gz/libmakemkv/inc/lgpl/smem.h Changed

makemkv-oss-1.8.7.tar.gz/libmakemkv/inc/lgpl/stdstring.h -> makemkv-oss-1.8.8.tar.gz/libmakemkv/inc/lgpl/stdstring.h Changed

makemkv-oss-1.8.7.tar.gz/libmakemkv/inc/lgpl/world.h -> makemkv-oss-1.8.8.tar.gz/libmakemkv/inc/lgpl/world.h Changed

makemkv-oss-1.8.7.tar.gz/libmakemkv/inc/libmkv/ebmlwrite.h -> makemkv-oss-1.8.8.tar.gz/libmakemkv/inc/libmkv/ebmlwrite.h Changed

makemkv-oss-1.8.7.tar.gz/libmakemkv/inc/libmkv/internal.h -> makemkv-oss-1.8.8.tar.gz/libmakemkv/inc/libmkv/internal.h Changed

makemkv-oss-1.8.7.tar.gz/libmakemkv/inc/libmkv/libmkv.h -> makemkv-oss-1.8.8.tar.gz/libmakemkv/inc/libmkv/libmkv.h Changed

makemkv-oss-1.8.7.tar.gz/libmakemkv/src/ebmlwrite.cpp -> makemkv-oss-1.8.8.tar.gz/libmakemkv/src/ebmlwrite.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmakemkv/src/libmakemkv.vers -> makemkv-oss-1.8.8.tar.gz/libmakemkv/src/libmakemkv.vers Changed

makemkv-oss-1.8.7.tar.gz/libmakemkv/src/libmkv.cpp -> makemkv-oss-1.8.8.tar.gz/libmakemkv/src/libmkv.cpp Changed

@@ -1,7 +1,7 @@
 /*
     libMakeMKV - MKV multiplexer library
 
-    Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com>
+    Copyright (C) 2007-2014 GuinpinSoft inc <libmkv@makemkv.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -100,18 +100,18 @@
 
 static void OverwriteIntegerData(IOCallback & output, uint64_t Value, uint64_t Position, unsigned int Size)
 {
-	binary FinalData[8]; // we don't handle more than 64 bits integers
-
-	uint64 TempValue = Value;
-	for (unsigned int i=0; i<Size;i++) {
-		FinalData[Size-i-1] = TempValue & 0xFF;
-		TempValue >>= 8;
-	}
-
-	uint64 CurrentPosition = output.getFilePointer();
-	output.setFilePointer(Position);
-	output.writeFully(FinalData,Size);
-	output.setFilePointer(CurrentPosition);
+    binary FinalData[8]; // we don't handle more than 64 bits integers
+
+    uint64 TempValue = Value;
+    for (unsigned int i=0; i<Size;i++) {
+        FinalData[Size-i-1] = TempValue & 0xFF;
+        TempValue >>= 8;
+    }
+
+    uint64 CurrentPosition = output.getFilePointer();
+    output.setFilePointer(Position);
+    output.writeFully(FinalData,Size);
+    output.setFilePointer(CurrentPosition);
 }
 
 static void FinishCluster(KaxCluster *cluster,IOCallback *File,KaxSegment *Segment);
@@ -401,7 +401,7 @@
     CChapters Chapters(TitleInfo,FormatInfo);
 
     // start render
-    uint64_t SegmentSize = FileSegment.WriteHead(File, 8);
+    FileSegment.WriteHead(File, 8);
 
     KaxSeekHead & MetaSeek = AddNewChild<KaxSeekHead>(FileSegment);
 
@@ -667,7 +667,7 @@
     MyTracks.RemoveAll();
 
     KaxCluster *curr_cluster=NULL,*prev_cluster=NULL;
-    int64_t cluster_timecode=0,frame_timecode;
+    int64_t cluster_timecode=0;
     int64_t max_duration=0;
     uint64_t prg_val=0;
     int64_t frame_end;
@@ -683,6 +683,7 @@
         min_timecode1=min_timecode2=BAD_TIMECODE;
         clusterFlags = 0;
 
+        stream_id = stream_id1 = stream_id2 = 0;
         for (unsigned int i=0;i<tracks.size();i++)
         {
             bool force_fetch,type2;
@@ -712,6 +713,7 @@
                     clusterFlags |= 2;
                 }
             }
+
             for (unsigned int j=0;j<frames_scan;j++)
             {
                 int64_t dts;
@@ -766,6 +768,9 @@
             stream_id = stream_id2;
             new_cluster = false;
             break;
+        default:
+            throw mkv_error_exception("clusterFlags");
+            break;
         }
 
         if (new_cluster)
@@ -848,7 +853,6 @@
         // have a frame and a cluster
 
         // update entire file duration
-        frame_timecode = frame->timecode;
         frame_end=frame->timecode+frame->duration;
         if (frame_end>max_duration) max_duration = frame_end;

makemkv-oss-1.8.7.tar.gz/libmakemkv/src/stdstring.cpp -> makemkv-oss-1.8.8.tar.gz/libmakemkv/src/stdstring.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmakemkv/src/version.cpp -> makemkv-oss-1.8.8.tar.gz/libmakemkv/src/version.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmakemkv/src/world.cpp -> makemkv-oss-1.8.8.tar.gz/libmakemkv/src/world.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxVersion.cpp -> makemkv-oss-1.8.8.tar.gz/libmatroska/src/KaxVersion.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/inc/libmmbd/mmbd.h -> makemkv-oss-1.8.8.tar.gz/libmmbd/inc/libmmbd/mmbd.h Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/aacs.cpp -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/aacs.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/bdplus.cpp -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/bdplus.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/bdplus.h -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/bdplus.h Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/crypto.h -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/crypto.h Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/crypto_ossl.cpp -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/crypto_ossl.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/marmmbd.cpp -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/marmmbd.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/mmbd.cpp -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/mmbd.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/mmbdipc.cpp -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/mmbdipc.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/mmbdipc.h -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/mmbdipc.h Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/mmconn.cpp -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/mmconn.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/mmconn.h -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/mmconn.h Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/nstring.cpp -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/nstring.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/utf8.cpp -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/utf8.cpp Changed

makemkv-oss-1.8.7.tar.gz/libmmbd/src/utf8.h -> makemkv-oss-1.8.8.tar.gz/libmmbd/src/utf8.h Changed

makemkv-oss-1.8.7.tar.gz/makefile.common -> makemkv-oss-1.8.8.tar.gz/makefile.common Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/inc/QtExt/NativeFileDialog.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/inc/QtExt/NativeFileDialog.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/inc/lgpl/apdefs.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/inc/lgpl/apdefs.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/aboutbox.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/aboutbox.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/aboutbox.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/aboutbox.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/abutton.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/abutton.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/abutton.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/abutton.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/api_linux.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/api_linux.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/api_posix.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/api_posix.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/backupdlg.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/backupdlg.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/backupdlg.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/backupdlg.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/client.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/client.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/dirselectbox.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/dirselectbox.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/dirselectbox.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/dirselectbox.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/image.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/image.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/image_data.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/image_data.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/image_defs.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/image_defs.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/image_linux.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/image_linux.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/lineeditk.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/lineeditk.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/lineeditk.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/lineeditk.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/logic.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/logic.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/logic_posix.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/logic_posix.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/logtext.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/logtext.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/logtext.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/logtext.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/lstring.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/lstring.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/main.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/main.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/mainwnd.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/mainwnd.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/mainwnd.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/mainwnd.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/margui.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/margui.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/marshall.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/marshall.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/nativefiledialog.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/nativefiledialog.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/notify.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/notify.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/notify.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/notify.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/notify_linux.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/notify_linux.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/notify_none.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/notify_none.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/progress.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/progress.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/qtapp.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/qtapp.h Changed

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2014 GuinpinSoft inc <makemkvgui@makemkv.com>
 
     You may use this file in accordance with the end user license
     agreement provided with the Software. For licensing terms and
@@ -65,7 +65,7 @@
 void AppendGrayBodyTag(QString &str,const QWidget *widget);
 
 QString FormatDiskFreeSpace(const utf16_t* FolderName);
-bool FormatDriveDiskInfo(QString& ProtectionString,QString& FullInfoString,const utf16_t* DeviceNameString,const void* DiskData,unsigned int DiskDataSize,AP_DiskFsFlags FsFlags,AP_DriveState DriveState);
+bool FormatDriveDiskInfo(QString& ProtectionString,QString& FullInfoString,const utf16_t* DeviceNameString,const utf16_t* DiscNameString,const void* DiskData,unsigned int DiskDataSize,AP_DiskFsFlags FsFlags,AP_DriveState DriveState);
 
 QString GetInfo(AP_UiItem* item,AP_ItemAttributeId Id);
 QString BuildItemInfo(AP_UiItem *Item,bool expertMode);

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/qtstr.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/qtstr.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/scsiinfo.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/scsiinfo.cpp Changed

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2014 GuinpinSoft inc <makemkvgui@makemkv.com>
 
     You may use this file in accordance with the end user license
     agreement provided with the Software. For licensing terms and
@@ -146,13 +146,35 @@
     return NULL;
 }
 
+static void AppendTimestamp(QString& str,const uint8_t* Data)
+{
+    char fstr[20];
+
+    cmemcpy(fstr+0,Data+4,4);
+    fstr[4]='-';
+    cmemcpy(fstr+5,Data+8,2);
+    fstr[7]='-';
+    cmemcpy(fstr+8,Data+10,2);
+    fstr[10]=' ';
+    cmemcpy(fstr+11,Data+12,2);
+    fstr[13]=':';
+    cmemcpy(fstr+14,Data+14,2);
+    fstr[16]=':';
+    cmemcpy(fstr+17,Data+16,2);
+    if (0==cmemcmp(fstr+11,"00:00:00",8))
+    {
+        append_const(str,fstr,10);
+    } else {
+        append_const(str,fstr,19);
+    }
+}
 
-bool FormatDriveDiskInfo(QString& ProtectionString,QString& FullInfoString,const utf16_t* DeviceNameString,const void* DiskData,unsigned int DiskDataSize,AP_DiskFsFlags FsFlags,AP_DriveState DriveState)
+bool FormatDriveDiskInfo(QString& ProtectionString,QString& FullInfoString,const utf16_t* DeviceNameString,const utf16_t* DiscNameString,const void* DiskData,unsigned int DiskDataSize,AP_DiskFsFlags FsFlags,AP_DriveState DriveState)
 {
     struct _items{
         DriveInfoItem   inquiry,drive_serial,firmware_date,firmware_string,current_profile;
         DriveInfoItem   copyright_info,dvd_physical_info,capacity,bd_disc_info,mkb_small;
-        DriveInfoItem   svm_small,aacs,ccert_small,aacs_high;
+        DriveInfoItem   svm_small,aacs,ccert_small,aacs_high,timestamp;
     } items;
 
     // extract all interesting items
@@ -205,6 +227,9 @@
         case 0x05102204:
             items.aacs_high=item;
             break;
+        case 0x05102205:
+            items.timestamp=item;
+            break;
 	default:
 	    break;
         }
@@ -275,25 +300,8 @@
     }
     if (items.firmware_date.Size==20)
     {
-        char fstr[20];
         append_const(str,AP_UI_STRING(APP_SI_FIRDATE));
-        cmemcpy(fstr+0,items.firmware_date.Data+4,4);
-        fstr[4]='-';
-        cmemcpy(fstr+5,items.firmware_date.Data+8,2);
-        fstr[7]='-';
-        cmemcpy(fstr+8,items.firmware_date.Data+10,2);
-        fstr[10]=' ';
-        cmemcpy(fstr+11,items.firmware_date.Data+12,2);
-        fstr[13]=':';
-        cmemcpy(fstr+14,items.firmware_date.Data+14,2);
-        fstr[16]=':';
-        cmemcpy(fstr+17,items.firmware_date.Data+16,2);
-        if (0==cmemcmp(fstr+11,"00:00:00",8))
-        {
-            append_const(str,fstr,10);
-        } else {
-            append_const(str,fstr,19);
-        }
+        AppendTimestamp(str,items.firmware_date.Data);
         append_const(str,"<br>");
     }
 
@@ -342,6 +350,33 @@
     case AP_DriveStateInserted:
         append_const(str,AP_UI_STRING(APP_SI_DISCINFO));
 
+        if (DiscNameString!=NULL)
+        {
+            if (DiscNameString[0])
+            {
+                const utf16_t* label = AP_UI_STRING(APP_IFACE_EMPTY_FRAME_LABEL);
+                size_t label_size = utf16len(label);
+                if ( (label_size>2) && (label[label_size-2]==' ') && (label[label_size-1]==':') )
+                {
+                    append_const(str,label,label_size-2);
+                    append_const(str,":");
+                } else {
+                    append_const(str,label);
+                }
+                append_const(str," ");
+                append_const(str,DiscNameString);
+                append_const(str,"<br>");
+            }
+        }
+
+        if (items.timestamp.Size==20)
+        {
+            append_const(str,AP_UI_STRING(VITEM_TIMESTAMP));
+            append_const(str,": ");
+            AppendTimestamp(str,items.timestamp.Data);
+            append_const(str,"<br>");
+        }
+
         // capacity
         if (items.capacity.Size>=8)
         {

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/sem_posix.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/sem_posix.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/settingdlg.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/settingdlg.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/settingdlg.h -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/settingdlg.h Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/spawn_posix.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/spawn_posix.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/str/en_utf16.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/str/en_utf16.cpp Changed

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2014 GuinpinSoft inc <makemkvgui@makemkv.com>
 
     You may use this file in accordance with the end user license
     agreement provided with the Software. For licensing terms and
@@ -13,7 +13,7 @@
 
 */
 
-static const unsigned short en_po_str[20202]={
+static const unsigned short en_po_str[20338]={
 'e','n','g',':','E','n','g','l','i','s','h',0,
 'D','B','G',' ','A','S','S','E','R','T',':',' ','%','1',' ','a','t',' ','%','2',':','%','3',0,
 'L','I','B','M','K','V','_','T','R','A','C','E',':',' ','%','1',0,
@@ -24,6 +24,7 @@
 'M','a','k','e','M','K','V',' ','a','p','p','l','i','c','a','t','i','o','n',' ','d','i','r','e','c','t','o','r','y',' ',0x27,'%','1',0x27,' ','i','s',' ','i','n','v','a','l','i','d',',',' ','t','h','e',' ','p','r','o','g','r','a','m',' ','w','i','l','l',' ','l','i','k','e','l','y',' ','b','e','h','a','v','e',' ','i','n','c','o','r','r','e','c','t','l','y',0,
 'F','a','i','l','e','d',' ','t','o',' ','l','o','a','d',' ','c','o','n','v','e','r','s','i','o','n',' ','p','r','o','f','i','l','e',' ','f','r','o','m',' ','f','i','l','e',' ',0x27,'%','1',0x27,0,
 'P','r','o','f','i','l','e',' ','p','a','r','s','i','n','g',' ','e','r','r','o','r',':',' ','%','1',0,
+'I','n','t','e','r','n','a','l',' ','e','r','r','o','r',':',' ','%','1',0,
 'F','i','l','e',' ','s','y','s','t','e','m',' ','n','o','t',' ','r','e','c','o','g','n','i','z','e','d',',',' ','d','i','s','c',' ','c','a','n',0x27,'t',' ','b','e',' ','o','p','e','n','e','d',0,
 'S','c','s','i',' ','o','p',' ','w','i','t','h',' ','b','u','f','f','e','r',' ','s','i','z','e','=','%','1',' ','.',' ','T','h','i','s',' ','i','s',' ','a',' ','p','e','r','f',' ','w','a','r','n','i','n','g',',',' ','y','o','u',' ','s','h','o','u','l','d','n',0x27,'t',' ','s','e','e',' ','m','a','n','y',' ','o','f',' ','t','h','e','s','e',0,
 'E','r','r','o','r',' ',0x27,'%','1',0x27,' ','o','c','c','u','r','r','e','d',' ','w','h','i','l','e',' ','r','e','a','d','i','n','g',' ',0x27,'%','2',0x27,' ','a','t',' ','o','f','f','s','e','t',' ',0x27,'%','3',0x27,0,
@@ -169,6 +170,7 @@
 'D','r','i','v','e',' ',0x27,'%','1',' ','%','2',' ','%','3',0x27,' ','r','e','q','u','i','r','e','s',' ','A','A','C','S',' ','b','u','s',' ','e','n','c','r','y','p','t','i','o','n',',',' ','d','i','s','c',' ','d','e','c','r','y','p','t','i','o','n',' ','m','a','y',' ','f','a','i','l','.',0,
 'H','i','g','h','e','s','t',' ','A','A','C','S',' ','v','e','r','s','i','o','n',' ','i','s',' ','v','%','1',' ',',',' ','M','K','B',' ','s','a','v','e','d',' ','a','s',' ','%','2',0,
 'I','t',' ','a','p','p','e','a','r','s',' ','t','h','a','t',' ','y','o','u',' ','a','r','e',' ','o','p','e','n','i','n','g',' ','t','h','e',' ','d','i','s','c',' ','p','r','o','c','e','s','s','e','d',' ','b','y',' ','D','v','d','F','a','b','/','M','a','c','T','h','e','R','i','p','p','e','r',' ','w','h','i','c','h',' ','i','s',' ','k','n','o','w','n',' ','t','o',' ','p','r','o','d','u','c','e',' ','d','a','m','a','g','e','d',' ','V','O','B',' ','f','i','l','e','s','.',' ','E','r','r','o','r','s',' ','m','a','y',' ','f','o','l','l','o','w',' ','-',' ','p','l','e','a','s','e',' ','u','s','e',' ','o','r','i','g','i','n','a','l',' ','d','i','s','c',' ','i','n','s','t','e','a','d','.',0,
+'B','o','t','h',' ','d','i','s','c',' ','a','n','d',' ','d','r','i','v','e',' ','r','e','q','u','i','r','e',' ','b','u','s',' ','e','n','c','r','y','p','t','i','o','n',',',' ','b','u','t',' ','t','h','e',' ','b','u','s',' ','k','e','y',' ','i','s',' ','n','o','t',' ','k','n','o','w','n','.',0,
 'P','r','o','c','e','s','s','i','n','g',' ','A','V',' ','c','l','i','p','s',0,
 'P','r','o','c','e','s','s','i','n','g',' ','m','o','v','i','e',' ','p','l','a','y','l','i','s','t','s',0,
 'D','e','c','r','y','p','t','i','n','g',0,
@@ -188,7 +190,7 @@
 '%','1',' ','o','v','e','r','l','a','p','p','i','n','g',' ','f','r','a','m','e','(','s',')',' ','d','r','o','p','p','e','d',' ','a','t',' ','s','e','g','m','e','n','t',' ','b','o','u','n','d','a','r','y',0,
 'a','u','d','i','o',' ','g','a','p',' ','-',' ','%','1',' ','m','i','s','s','i','n','g',' ','f','r','a','m','e','(','s',')',0,
 'a','u','d','i','o',' ','g','a','p',' ','w','a','s',' ','f','i','l','l','e','d',' ','w','i','t','h',' ','%','1',' ','d','u','p','l','i','c','a','t','e',' ','f','r','a','m','e','s',',',' ','a','u','d','i','o',' ','s','k','e','w',' ','i','s',' ','%','2',0,
-'a','u','d','i','o',' ','g','a','p',' ','w','a','s',' ','f','i','l','l','e','d',' ','w','i','t','h',' ','%','1',' ','s','i','l','e','n','t',' ','f','r','a','m','e','s',',',' ','a','u','d','i','o',' ','s','k','e','w',' ','i','s',' ','%','2',0,
+'a','u','d','i','o',' ','g','a','p',' ','w','a','s',' ','f','i','l','l','e','d',' ','w','i','t','h',' ','s','i','l','e','n','c','e',0,
 's','h','o','r','t',' ','a','u','d','i','o',' ','g','a','p',' ','w','a','s',' ','r','e','m','o','v','e','d',',',' ','a','u','d','i','o',' ','s','k','e','w',' ','i','s',' ','%','1',0,
 '%','1',' ','f','r','a','m','e','(','s',')',' ','d','r','o','p','p','e','d',' ','t','o',' ','r','e','d','u','c','e',' ','a','u','d','i','o',' ','s','k','e','w',' ','t','o',' ','%','2',0,
 'e','n','c','o','u','n','t','e','r','e','d',' ','o','v','e','r','l','a','p','p','i','n','g',' ','f','r','a','m','e',',',' ','a','u','d','i','o',' ','s','k','e','w',' ','i','s',' ','%','1',0,
@@ -294,6 +296,10 @@
 '(',' ','L','o','s','s','y',' ','c','o','n','v','e','r','s','i','o','n',' ',')',0,
 '(',' ','L','o','s','s','l','e','s','s',' ','c','o','n','v','e','r','s','i','o','n',' ',')',0,
 'C','h','a','p','t','e','r',' ','%','1',0,
+'M','o','n','o',0,
+'S','t','e','r','e','o',0,
+'S','u','r','r','o','u','n','d',0,
+'P','r','i','m','a','r','y',' ','t','i','t','l','e',0,
 'T','y','p','e',0,
 'N','a','m','e',0,
 'L','a','n','g','u','a','g','e',0,
@@ -322,12 +328,15 @@
 'O','u','t','p','u','t',' ','d','e','s','c','r','i','p','t','i','o','n',0,
 'M','K','V',' ','F','l','a','g','s',0,
 'M','K','V',' ','F','l','a','g','s',0,
+'C','h','a','n','n','e','l',' ','l','a','y','o','u','t',0,
+'A','u','d','i','o',' ','m','i','x',0,
 'C','o','p','y',' ','a','s',' ','i','s',0,
 'R','a','w',' ','L','P','C','M',' ','a','u','d','i','o',' ','w','i','t','h','o','u','t',' ','c','h','a','n','n','e','l',' ','c','o','n','f','i','g','u','r','a','t','i','o','n',' ','m','e','t','a','d','a','t','a',0,
 'L','P','C','M',' ','a','u','d','i','o',' ','i','n',' ','W','A','V',' ','c','o','n','t','a','i','n','e','r',' ','w','i','t','h',' ','c','h','a','n','n','e','l',' ','c','o','n','f','i','g','u','r','a','t','i','o','n',' ','m','e','t','a','d','a','t','a',0,
 'F','L','A','C',' ','a','u','d','i','o',0,
 'V','O','B','S','U','B',' ','s','u','b','t','i','t','l','e','s',0,
 'A','C','3',' ','a','u','d','i','o',0,
+'A','A','C',' ','a','u','d','i','o',0,
 'D','e','f','a','u','l','t',0,
 'F','o','r','c','e','d',0,
 'M','a','k','e','M','K','V',' ','B','E','T','A',0,
@@ -526,54 +535,55 @@
 'O','S',' ','d','e','v','i','c','e',' ','n','a','m','e',':',' ',0,
 0};
 
-static const unsigned int en_po_off[1021]={
-1000,0,1001,12,1002,36,1003,53,1004,77,1005,124,1006,135,1007,136,1008,226,1009,275,2001,301,
-2002,350,2003,436,2004,490,2005,558,2006,668,2007,785,2008,940,2009,1063,2010,1191,2011,1236,2012,1380,
-2013,1491,2014,1604,2015,1652,2016,1734,2017,1897,2018,2012,2019,2074,2020,2114,2021,2281,2022,2404,2200,2538,
-2201,2556,2202,2580,2203,2609,2204,2639,2205,2668,2206,2691,2207,2708,2208,2728,2209,2749,2210,2772,2300,2797,
-2301,2811,2302,2828,2303,2844,2304,2863,3000,2888,3001,2910,3002,3001,3003,3069,3004,3102,3005,3150,3006,3176,
-3007,3209,3008,3239,3009,3297,3010,3345,3011,3398,3012,3433,3013,3473,3014,3519,3015,3560,3016,3611,3017,3633,
-3018,3660,3019,3700,3020,3770,3021,3846,3022,3907,3023,3941,3024,4015,3025,4155,3026,4270,3027,4352,3028,4408,
-3029,4445,3030,4505,3031,4568,3032,4718,3033,4827,3034,4873,3035,4918,3036,5008,3037,5067,3038,5108,3039,5148,
-3040,5206,3041,5240,3042,5278,3043,5386,3100,5469,3101,5486,3102,5519,3103,5541,3104,5559,3105,5575,3106,5582,
-3107,5595,3108,5604,3109,5617,3110,5630,3111,5642,3200,5662,3201,5691,3202,5709,3203,5720,3204,5738,3210,5835,
-3220,5852,3221,5920,3300,5970,3301,6026,3302,6078,3303,6125,3304,6192,3305,6213,3306,6267,3307,6366,3308,6397,
-3309,6439,3310,6485,3311,6603,3312,6670,3313,6747,3314,6815,3315,6864,3316,6887,3317,6910,3318,6932,3319,6985,
-3320,7047,3321,7107,3322,7210,3323,7262,3324,7321,3325,7367,3326,7420,3327,7493,3328,7557,3329,7606,3330,7719,
-3331,7776,3332,7810,3333,7836,3334,7901,3335,8300,3336,8668,3337,9051,3338,9156,3339,9192,3340,9241,3341,9314,
-3342,9360,3400,9533,3401,9553,3402,9580,3403,9591,3404,9609,3405,9630,3406,9638,3407,9658,4001,9671,4002,9754,
-4003,9820,4004,9885,4007,9968,4008,10030,4009,10088,4020,10199,4021,10234,4022,10286,4023,10318,4024,10382,4025,10443,
-4026,10489,4027,10536,4028,10584,4040,10627,4041,10705,4042,10764,4043,10816,4044,10913,4045,10984,4046,11082,4047,11125,
-4048,11163,4049,11198,4050,11250,4051,11331,4500,11381,4501,11462,4502,11487,4503,11520,4504,11554,5000,11606,5001,11631,
-5002,11683,5003,11700,5004,11735,5005,11762,5006,11778,5007,11801,5008,11824,5009,11865,5010,11898,5011,11918,5012,11951,
-5013,11990,5014,12045,5015,12080,5016,12149,5017,12173,5018,12192,5019,12216,5020,12241,5021,12396,5022,12562,5024,12645,
-5025,12676,5026,12692,5027,12699,5028,12711,5029,12723,5030,12733,5031,12745,5033,12757,5036,12768,5037,12800,5038,12843,
-5039,13008,5040,13189,5041,13415,5042,13562,5043,13612,5044,13708,5045,13721,5046,13735,5047,13748,5048,13766,5049,13781,
-5050,13788,5051,13838,5052,13996,5053,14169,5054,14365,5055,14425,5056,14493,5057,14561,5060,14589,5061,14598,5062,14611,
-5063,14622,5064,14634,5065,14640,5066,14648,5067,14663,5068,14669,5069,14735,5070,14749,5071,14761,5072,14938,5073,14971,
-5074,15051,5075,15177,5076,15257,5077,15318,5078,15357,5079,15419,5080,15462,5081,15477,5082,15490,5083,15534,5084,15604,
-5085,15681,5086,15745,5087,15753,5088,15774,5089,15798,5201,15809,5202,15814,5203,15819,5204,15828,5207,15837,5208,15843,
-5209,15858,5210,15867,5214,15872,5215,15881,5216,15887,5217,15904,5218,15916,5219,15932,5220,15943,5221,15956,5222,15967,
-5223,15973,5224,15983,5225,15999,5226,16013,5227,16025,5228,16035,5233,16053,5234,16066,5235,16080,5238,16099,5239,16109,
-5301,16119,5302,16130,5303,16184,5304,16248,5305,16259,5306,16276,5380,16286,5381,16294,6000,16301,6001,16314,6002,16333,
-6003,16352,6005,16386,6006,16407,6007,16421,6008,16503,6010,16517,6011,16529,6012,16536,6013,16580,6014,16587,6015,16612,
-6016,16630,6017,16677,6018,16698,6019,16719,6020,16725,6021,16732,6022,16749,6023,16756,6030,16789,6031,16795,6032,16801,
-6034,16807,6035,16815,6036,16825,6037,16833,6038,16858,6039,16870,6040,16882,6041,16911,6042,16966,6043,16979,6044,17007,
-6045,17020,6046,17033,6047,17055,6048,17065,6050,17089,6051,17134,6052,17227,6053,17239,6054,17255,6055,17271,6056,17286,
-6057,17299,6058,17320,6059,17326,6060,17333,6061,17340,6062,17353,6063,17367,6064,17384,6065,17402,6066,17418,6067,17431,
-6068,17443,6069,17457,6070,17462,6071,17471,6072,17478,6073,17485,6074,17493,6075,17506,6076,17511,6077,17535,6078,17566,
-6079,17621,6080,17691,6081,17699,6082,17704,6083,17723,6085,17747,6086,17752,6087,17785,6088,17827,6089,17847,6090,17852,
-6091,17857,6092,17866,6093,17873,6094,17893,6095,17907,6096,17928,6097,17936,6098,17960,6099,18022,6100,18043,6101,18054,
-6102,18066,6103,18074,6104,18079,6105,18104,6106,18111,6107,18136,6108,18157,6109,18198,6110,18215,6111,18226,6112,18243,
-6119,18257,6120,18287,6121,18316,6122,18345,6123,18379,6124,18410,6125,18442,6126,18462,6127,18492,6128,18520,6129,18542,
-6130,18556,6131,18582,6132,18590,6133,18613,6134,18624,6135,18636,6136,18656,6137,18676,6138,18688,6139,18953,6142,18985,
-6143,19008,6144,19019,6145,19036,6146,19046,6147,19071,6148,19079,6149,19099,6150,19141,6151,19165,6152,19205,6153,19214,
-6154,19235,6156,19256,6157,19261,6158,19266,6161,19292,6162,19306,6163,19332,6164,19350,6165,19353,6166,19363,6167,19374,
-6169,19397,6170,19411,6171,19446,6172,19479,6173,19488,6174,19506,6175,19531,6176,19547,6180,19574,6181,19582,6200,19593,
-6201,19599,6202,19605,6203,19611,6204,19621,6205,19626,6206,19638,6207,19647,6209,19661,6210,19674,6211,19685,6212,19700,
-6213,19712,6214,19721,6215,19732,6216,19741,6300,19749,6301,19778,6302,19796,6303,19811,6304,19821,6305,19832,6306,19848,
-6307,19867,6308,19883,6309,19906,6320,19929,6321,19961,6322,19993,6323,20018,6324,20034,6325,20046,6326,20058,6327,20078,
-6329,20097,6330,20118,6331,20151,6332,20184,0};
+static const unsigned int en_po_off[1039]={
+1000,0,1001,12,1002,36,1003,53,1004,77,1005,124,1006,135,1007,136,1008,226,1009,275,1010,301,
+2001,320,2002,369,2003,455,2004,509,2005,577,2006,687,2007,804,2008,959,2009,1082,2010,1210,2011,1255,
+2012,1399,2013,1510,2014,1623,2015,1671,2016,1753,2017,1916,2018,2031,2019,2093,2020,2133,2021,2300,2022,2423,
+2200,2557,2201,2575,2202,2599,2203,2628,2204,2658,2205,2687,2206,2710,2207,2727,2208,2747,2209,2768,2210,2791,
+2300,2816,2301,2830,2302,2847,2303,2863,2304,2882,3000,2907,3001,2929,3002,3020,3003,3088,3004,3121,3005,3169,
+3006,3195,3007,3228,3008,3258,3009,3316,3010,3364,3011,3417,3012,3452,3013,3492,3014,3538,3015,3579,3016,3630,
+3017,3652,3018,3679,3019,3719,3020,3789,3021,3865,3022,3926,3023,3960,3024,4034,3025,4174,3026,4289,3027,4371,
+3028,4427,3029,4464,3030,4524,3031,4587,3032,4737,3033,4846,3034,4892,3035,4937,3036,5027,3037,5086,3038,5127,
+3039,5167,3040,5225,3041,5259,3042,5297,3043,5405,3100,5488,3101,5505,3102,5538,3103,5560,3104,5578,3105,5594,
+3106,5601,3107,5614,3108,5623,3109,5636,3110,5649,3111,5661,3200,5681,3201,5710,3202,5728,3203,5739,3204,5757,
+3210,5854,3220,5871,3221,5939,3300,5989,3301,6045,3302,6097,3303,6144,3304,6211,3305,6232,3306,6286,3307,6385,
+3308,6416,3309,6458,3310,6504,3311,6622,3312,6689,3313,6766,3314,6834,3315,6883,3316,6906,3317,6929,3318,6951,
+3319,7004,3320,7066,3321,7126,3322,7229,3323,7281,3324,7340,3325,7386,3326,7439,3327,7512,3328,7576,3329,7625,
+3330,7738,3331,7795,3332,7829,3333,7855,3334,7920,3335,8319,3336,8687,3337,9070,3338,9175,3339,9211,3340,9260,
+3341,9333,3342,9379,3343,9552,3400,9626,3401,9646,3402,9673,3403,9684,3404,9702,3405,9723,3406,9731,3407,9751,
+4001,9764,4002,9847,4003,9913,4004,9978,4007,10061,4008,10123,4009,10181,4020,10292,4021,10327,4022,10379,4023,10411,
+4024,10475,4025,10509,4026,10555,4027,10602,4028,10650,4040,10693,4041,10771,4042,10830,4043,10882,4044,10979,4045,11050,
+4046,11148,4047,11191,4048,11229,4049,11264,4050,11316,4051,11397,4500,11447,4501,11528,4502,11553,4503,11586,4504,11620,
+5000,11672,5001,11697,5002,11749,5003,11766,5004,11801,5005,11828,5006,11844,5007,11867,5008,11890,5009,11931,5010,11964,
+5011,11984,5012,12017,5013,12056,5014,12111,5015,12146,5016,12215,5017,12239,5018,12258,5019,12282,5020,12307,5021,12462,
+5022,12628,5024,12711,5025,12742,5026,12758,5027,12765,5028,12777,5029,12789,5030,12799,5031,12811,5033,12823,5036,12834,
+5037,12866,5038,12909,5039,13074,5040,13255,5041,13481,5042,13628,5043,13678,5044,13774,5045,13787,5046,13801,5047,13814,
+5048,13832,5049,13847,5050,13854,5051,13904,5052,14062,5053,14235,5054,14431,5055,14491,5056,14559,5057,14627,5060,14655,
+5061,14664,5062,14677,5063,14688,5064,14700,5065,14706,5066,14714,5067,14729,5068,14735,5069,14801,5070,14815,5071,14827,
+5072,15004,5073,15037,5074,15117,5075,15243,5076,15323,5077,15384,5078,15423,5079,15485,5080,15528,5081,15543,5082,15556,
+5083,15600,5084,15670,5085,15747,5086,15811,5087,15819,5088,15840,5089,15864,5090,15875,5091,15880,5092,15887,5100,15896,
+5201,15910,5202,15915,5203,15920,5204,15929,5207,15938,5208,15944,5209,15959,5210,15968,5214,15973,5215,15982,5216,15988,
+5217,16005,5218,16017,5219,16033,5220,16044,5221,16057,5222,16068,5223,16074,5224,16084,5225,16100,5226,16114,5227,16126,
+5228,16136,5233,16154,5234,16167,5235,16181,5238,16200,5239,16210,5240,16220,5248,16235,5301,16245,5302,16256,5303,16310,
+5304,16374,5305,16385,5306,16402,5307,16412,5380,16422,5381,16430,6000,16437,6001,16450,6002,16469,6003,16488,6005,16522,
+6006,16543,6007,16557,6008,16639,6010,16653,6011,16665,6012,16672,6013,16716,6014,16723,6015,16748,6016,16766,6017,16813,
+6018,16834,6019,16855,6020,16861,6021,16868,6022,16885,6023,16892,6030,16925,6031,16931,6032,16937,6034,16943,6035,16951,
+6036,16961,6037,16969,6038,16994,6039,17006,6040,17018,6041,17047,6042,17102,6043,17115,6044,17143,6045,17156,6046,17169,
+6047,17191,6048,17201,6050,17225,6051,17270,6052,17363,6053,17375,6054,17391,6055,17407,6056,17422,6057,17435,6058,17456,
+6059,17462,6060,17469,6061,17476,6062,17489,6063,17503,6064,17520,6065,17538,6066,17554,6067,17567,6068,17579,6069,17593,
+6070,17598,6071,17607,6072,17614,6073,17621,6074,17629,6075,17642,6076,17647,6077,17671,6078,17702,6079,17757,6080,17827,
+6081,17835,6082,17840,6083,17859,6085,17883,6086,17888,6087,17921,6088,17963,6089,17983,6090,17988,6091,17993,6092,18002,
+6093,18009,6094,18029,6095,18043,6096,18064,6097,18072,6098,18096,6099,18158,6100,18179,6101,18190,6102,18202,6103,18210,
+6104,18215,6105,18240,6106,18247,6107,18272,6108,18293,6109,18334,6110,18351,6111,18362,6112,18379,6119,18393,6120,18423,
+6121,18452,6122,18481,6123,18515,6124,18546,6125,18578,6126,18598,6127,18628,6128,18656,6129,18678,6130,18692,6131,18718,
+6132,18726,6133,18749,6134,18760,6135,18772,6136,18792,6137,18812,6138,18824,6139,19089,6142,19121,6143,19144,6144,19155,
+6145,19172,6146,19182,6147,19207,6148,19215,6149,19235,6150,19277,6151,19301,6152,19341,6153,19350,6154,19371,6156,19392,
+6157,19397,6158,19402,6161,19428,6162,19442,6163,19468,6164,19486,6165,19489,6166,19499,6167,19510,6169,19533,6170,19547,
+6171,19582,6172,19615,6173,19624,6174,19642,6175,19667,6176,19683,6180,19710,6181,19718,6200,19729,6201,19735,6202,19741,
+6203,19747,6204,19757,6205,19762,6206,19774,6207,19783,6209,19797,6210,19810,6211,19821,6212,19836,6213,19848,6214,19857,
+6215,19868,6216,19877,6300,19885,6301,19914,6302,19932,6303,19947,6304,19957,6305,19968,6306,19984,6307,20003,6308,20019,
+6309,20042,6320,20065,6321,20097,6322,20129,6323,20154,6324,20170,6325,20182,6326,20194,6327,20214,6329,20233,6330,20254,
+6331,20287,6332,20320,0};
 
 extern "C" const unsigned short * en_po_getstr_utf16(unsigned int code)
 {

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/uisync.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/uisync.cpp Changed

makemkv-oss-1.8.7.tar.gz/makemkvgui/src/viteminfo.cpp -> makemkv-oss-1.8.8.tar.gz/makemkvgui/src/viteminfo.cpp Changed

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2014 GuinpinSoft inc <makemkvgui@makemkv.com>
 
     You may use this file in accordance with the end user license
     agreement provided with the Software. For licensing terms and
@@ -49,6 +49,26 @@
     }
 }
 
+static void AppendItem(QString &str,AP_UiItem *pi,AP_ItemAttributeId id,AP_ItemAttributeId idout)
+{
+    const utf16_t* p;
+
+    if (NULL!=(p=pi->GetInfo(id)))
+    {
+        append_const(str,AppGetString( id + AP_UIMSG_VITEM_BASE));
+        append_const(str,": ");
+        append_const_escaped(str,p);
+        if (pi->GetInfo(idout))
+        {
+            static const utf16_t ra[4] = {' ',0x2192,' ',0};
+            append_const(str,ra);
+            append_const(str,pi->GetInfo(idout));
+        }
+        append_const(str,"<br>");
+    }
+}
+
+
 static void AppendCommonAttributes(QString &str,AP_UiItem *pi,bool expertMode)
 {
     unsigned int flags;
@@ -98,10 +118,11 @@
     AppendItem(str,pi,ap_iaLangName);
     AppendItem(str,pi,ap_iaDuration);
     AppendItem(str,pi,ap_iaChapterCount);
-    AppendItem(str,pi,ap_iaCodecLong);
-    AppendItem(str,pi,ap_iaAudioChannelsCount);
-    AppendItem(str,pi,ap_iaAudioSampleRate);
-    AppendItem(str,pi,ap_iaAudioSampleSize);
+    AppendItem(str,pi,ap_iaCodecLong,ap_iaOutputCodecShort);
+    AppendItem(str,pi,ap_iaAudioChannelsCount,ap_iaOutputAudioChannelsCount);
+    AppendItem(str,pi,ap_iaAudioChannelLayoutName,ap_iaOutputAudioChannelLayoutName);
+    AppendItem(str,pi,ap_iaAudioSampleRate,ap_iaOutputAudioSampleRate);
+    AppendItem(str,pi,ap_iaAudioSampleSize,ap_iaOutputAudioSampleSize);
     AppendItem(str,pi,ap_iaVideoSize);
     AppendItem(str,pi,ap_iaVideoAspectRatio);
     AppendItem(str,pi,ap_iaVideoFrameRate);
@@ -111,6 +132,7 @@
     AppendItem(str,pi,ap_iaOutputFileName);
     AppendItem(str,pi,ap_iaOutputFormat);
     AppendItem(str,pi,ap_iaOutputFormatDescription);
+    AppendItem(str,pi,ap_iaOutputAudioMixDescription);
     if (expertMode) AppendItem(str,pi,ap_iaMkvFlagsText);
 }

makemkv-oss-1.8.7.tar.gz/sstring/src/sstring.cpp -> makemkv-oss-1.8.8.tar.gz/sstring/src/sstring.cpp Changed

Changes of Revision 29