rho-tau-extensions 6.0.11 → 6.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/libs/crosswalk/ext/platform/android/adds/lib/armeabi/libxwalkcore.so +0 -0
- data/libs/crosswalk/ext/platform/android/adds/lib/armeabi/libxwalkdummy.so +0 -0
- data/libs/crosswalk/ext/platform/android/adds/lib/x86/libxwalkcore.so +0 -0
- data/libs/crosswalk/ext/platform/android/adds/lib/x86/libxwalkdummy.so +0 -0
- data/libs/crosswalk/ext/platform/android/adds/lib/xwalk_core_library_java.jar +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/layout-v17/dropdown_item.xml +2 -2
- data/libs/crosswalk/ext/platform/android/adds/res/layout/dropdown_item.xml +1 -1
- data/libs/crosswalk/ext/platform/android/adds/res/menu/select_action_menu.xml +8 -8
- data/libs/crosswalk/ext/platform/android/adds/res/raw/icudtl.dat +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/raw/xwalk.pak +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/raw/xwalk_100_percent.pak +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-am/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-ar/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-bg/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-ca/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-cs/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-da/android_ui_strings.xml +4 -3
- data/libs/crosswalk/ext/platform/android/adds/res/values-de/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-el/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-en-rGB/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-es-rUS/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-es/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-fa/android_ui_strings.xml +2 -1
- data/libs/crosswalk/ext/platform/android/adds/res/values-fi/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-fr/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-hi/android_ui_strings.xml +2 -1
- data/libs/crosswalk/ext/platform/android/adds/res/values-hr/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-hu/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-in/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-it/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-iw/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-ja/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-ko/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-lt/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-lv/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-nb/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-nl/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-pl/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-pt-rBR/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-pt-rPT/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-ro/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-ru/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-sk/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-sl/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-sr/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-sv/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-sw/android_ui_strings.xml +2 -1
- data/libs/crosswalk/ext/platform/android/adds/res/values-th/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-tl/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-tr/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-uk/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-v17/{ui_java_styles.xml → styles_03.xml} +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-v21/{ui_java_styles.xml → styles_03.xml} +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-vi/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-zh-rCN/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values-zh-rTW/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/android_ui_strings.xml +1 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_attrs.xml → attrs.xml} +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/attrs_03.xml +18 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_colors.xml → colors_xwalk.xml} +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/{ui_java_dimens.xml → dimens_03.xml} +1 -3
- data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_dimens.xml → dimens_xwalk.xml} +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/ids_xwalk.xml +12 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/strings_00.xml +16 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_core_internal_java_strings.xml → strings_01.xml} +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_core_java_strings.xml → strings_02.xml} +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/{ui_java_strings.xml → strings_03.xml} +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_styles.xml → styles_00.xml} +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/{ui_java_styles.xml → styles_03.xml} +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_values.xml → values_00.xml} +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/values/xwalk_app_strings.xml +7 -10
- data/libs/crosswalk/ext/platform/android/adds/res/values/xwalk_resources_list.xml +2 -1
- data/libs/enterprise-barcode/ext/platform/iphone/Barcode.xcodeproj/project.pbxproj +8 -4
- data/libs/nodejs/ext/platform/iphone/Nodejs.xcodeproj/project.pbxproj +8 -4
- data/libs/openssl.so-edge/ext/android/armeabi/libcrypto.a +0 -0
- data/libs/openssl.so-edge/ext/android/armeabi/libssl.a +0 -0
- data/libs/openssl.so-edge/ext/android/x86/libcrypto.a +0 -0
- data/libs/openssl.so-edge/ext/android/x86/libssl.a +0 -0
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/internal/asn1t.h +19 -0
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/internal/dso.h +23 -0
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/internal/thread_once.h +5 -2
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/asn1.h +5 -2
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/asn1t.h +5 -0
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/bio.h +9 -12
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/bn.h +1 -1
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/buffer.h +1 -4
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/conf.h +1 -0
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/crypto.h +5 -1
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/ct.h +17 -2
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/dh.h +24 -6
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/dsa.h +1 -0
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/e_os2.h +3 -16
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/ec.h +7 -12
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/engine.h +0 -2
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/err.h +3 -2
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/evp.h +11 -1
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/lhash.h +13 -0
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/objects.h +2 -2
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/ocsp.h +3 -16
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/opensslconf.h +20 -8
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/opensslv.h +3 -3
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/rsa.h +2 -0
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/seed.h +1 -3
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/srtp.h +1 -1
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/ssl.h +85 -52
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/ssl3.h +4 -1
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/tls1.h +6 -6
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/ui.h +10 -0
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/x509.h +1 -1
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/x509_vfy.h +5 -0
- data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/x509v3.h +1 -0
- data/version +1 -1
- metadata +19 -27
- data/libs/crosswalk/ext/platform/android/adds/res/drawable-hdpi/crosswalk.png +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/drawable-ldpi/crosswalk.png +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/drawable-mdpi/crosswalk.png +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/drawable-xhdpi/crosswalk.png +0 -0
- data/libs/crosswalk/ext/platform/android/adds/res/drawable/launchscreen_bg.xml +0 -19
- data/libs/crosswalk/ext/platform/android/adds/res/layout-v17/autofill_suggestion_item.xml +0 -18
- data/libs/crosswalk/ext/platform/android/adds/res/layout/autofill_suggestion_item.xml +0 -7
- data/libs/crosswalk/ext/platform/android/adds/res/raw/contacts_api.js +0 -206
- data/libs/crosswalk/ext/platform/android/adds/res/raw/device_capabilities_api.js +0 -231
- data/libs/crosswalk/ext/platform/android/adds/res/raw/messaging_api.js +0 -359
- data/libs/crosswalk/ext/platform/android/adds/res/raw/presentation_api.js +0 -144
- data/libs/crosswalk/ext/platform/android/adds/res/values-v14/theme.xml +0 -16
- data/libs/crosswalk/ext/platform/android/adds/res/values/ui_java_attrs.xml +0 -9
@@ -196,7 +196,7 @@ int BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
|
|
196
196
|
*/
|
197
197
|
void BN_set_negative(BIGNUM *b, int n);
|
198
198
|
/** BN_is_negative returns 1 if the BIGNUM is negative
|
199
|
-
* \param
|
199
|
+
* \param b pointer to the BIGNUM object
|
200
200
|
* \return 1 if a < 0 and 0 otherwise
|
201
201
|
*/
|
202
202
|
int BN_is_negative(const BIGNUM *b);
|
@@ -208,6 +208,7 @@ int ERR_load_CONF_strings(void);
|
|
208
208
|
# define CONF_R_NO_VALUE 108
|
209
209
|
# define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103
|
210
210
|
# define CONF_R_UNKNOWN_MODULE_NAME 113
|
211
|
+
# define CONF_R_VARIABLE_EXPANSION_TOO_LONG 116
|
211
212
|
# define CONF_R_VARIABLE_HAS_NO_VALUE 104
|
212
213
|
|
213
214
|
# ifdef __cplusplus
|
@@ -146,6 +146,8 @@ int CRYPTO_mem_ctrl(int mode);
|
|
146
146
|
CRYPTO_secure_zalloc(num, OPENSSL_FILE, OPENSSL_LINE)
|
147
147
|
# define OPENSSL_secure_free(addr) \
|
148
148
|
CRYPTO_secure_free(addr, OPENSSL_FILE, OPENSSL_LINE)
|
149
|
+
# define OPENSSL_secure_clear_free(addr, num) \
|
150
|
+
CRYPTO_secure_clear_free(addr, num, OPENSSL_FILE, OPENSSL_LINE)
|
149
151
|
# define OPENSSL_secure_actual_size(ptr) \
|
150
152
|
CRYPTO_secure_actual_size(ptr)
|
151
153
|
|
@@ -174,7 +176,7 @@ typedef void CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
|
|
174
176
|
typedef void CRYPTO_EX_free (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
|
175
177
|
int idx, long argl, void *argp);
|
176
178
|
typedef int CRYPTO_EX_dup (CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
|
177
|
-
void *
|
179
|
+
void *from_d, int idx, long argl, void *argp);
|
178
180
|
__owur int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
|
179
181
|
CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
|
180
182
|
CRYPTO_EX_free *free_func);
|
@@ -285,6 +287,8 @@ int CRYPTO_secure_malloc_done(void);
|
|
285
287
|
void *CRYPTO_secure_malloc(size_t num, const char *file, int line);
|
286
288
|
void *CRYPTO_secure_zalloc(size_t num, const char *file, int line);
|
287
289
|
void CRYPTO_secure_free(void *ptr, const char *file, int line);
|
290
|
+
void CRYPTO_secure_clear_free(void *ptr, size_t num,
|
291
|
+
const char *file, int line);
|
288
292
|
int CRYPTO_secure_allocated(const void *ptr);
|
289
293
|
int CRYPTO_secure_malloc_initialized(void);
|
290
294
|
size_t CRYPTO_secure_actual_size(void *ptr);
|
@@ -98,6 +98,21 @@ const CTLOG_STORE *CT_POLICY_EVAL_CTX_get0_log_store(const CT_POLICY_EVAL_CTX *c
|
|
98
98
|
void CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(CT_POLICY_EVAL_CTX *ctx,
|
99
99
|
CTLOG_STORE *log_store);
|
100
100
|
|
101
|
+
/*
|
102
|
+
* Gets the time, in milliseconds since the Unix epoch, that will be used as the
|
103
|
+
* current time when checking whether an SCT was issued in the future.
|
104
|
+
* Such SCTs will fail validation, as required by RFC6962.
|
105
|
+
*/
|
106
|
+
uint64_t CT_POLICY_EVAL_CTX_get_time(const CT_POLICY_EVAL_CTX *ctx);
|
107
|
+
|
108
|
+
/*
|
109
|
+
* Sets the time to evaluate SCTs against, in milliseconds since the Unix epoch.
|
110
|
+
* If an SCT's timestamp is after this time, it will be interpreted as having
|
111
|
+
* been issued in the future. RFC6962 states that "TLS clients MUST reject SCTs
|
112
|
+
* whose timestamp is in the future", so an SCT will not validate in this case.
|
113
|
+
*/
|
114
|
+
void CT_POLICY_EVAL_CTX_set_time(CT_POLICY_EVAL_CTX *ctx, uint64_t time_in_ms);
|
115
|
+
|
101
116
|
/*****************
|
102
117
|
* SCT functions *
|
103
118
|
*****************/
|
@@ -467,7 +482,6 @@ int ERR_load_CT_strings(void);
|
|
467
482
|
# define CT_F_CTLOG_NEW 117
|
468
483
|
# define CT_F_CTLOG_NEW_FROM_BASE64 118
|
469
484
|
# define CT_F_CTLOG_NEW_FROM_CONF 119
|
470
|
-
# define CT_F_CTLOG_NEW_NULL 120
|
471
485
|
# define CT_F_CTLOG_STORE_LOAD_CTX_NEW 122
|
472
486
|
# define CT_F_CTLOG_STORE_LOAD_FILE 123
|
473
487
|
# define CT_F_CTLOG_STORE_LOAD_LOG 130
|
@@ -482,6 +496,7 @@ int ERR_load_CT_strings(void);
|
|
482
496
|
# define CT_F_O2I_SCT_LIST 111
|
483
497
|
# define CT_F_O2I_SCT_SIGNATURE 112
|
484
498
|
# define CT_F_SCT_CTX_NEW 126
|
499
|
+
# define CT_F_SCT_CTX_VERIFY 128
|
485
500
|
# define CT_F_SCT_NEW 100
|
486
501
|
# define CT_F_SCT_NEW_FROM_BASE64 127
|
487
502
|
# define CT_F_SCT_SET0_LOG_ID 101
|
@@ -491,7 +506,6 @@ int ERR_load_CT_strings(void);
|
|
491
506
|
# define CT_F_SCT_SET_LOG_ENTRY_TYPE 102
|
492
507
|
# define CT_F_SCT_SET_SIGNATURE_NID 103
|
493
508
|
# define CT_F_SCT_SET_VERSION 104
|
494
|
-
# define CT_F_SCT_CTX_VERIFY 128
|
495
509
|
|
496
510
|
/* Reason codes. */
|
497
511
|
# define CT_R_BASE64_DECODE_ERROR 108
|
@@ -501,6 +515,7 @@ int ERR_load_CT_strings(void);
|
|
501
515
|
# define CT_R_LOG_CONF_MISSING_DESCRIPTION 111
|
502
516
|
# define CT_R_LOG_CONF_MISSING_KEY 112
|
503
517
|
# define CT_R_LOG_KEY_INVALID 113
|
518
|
+
# define CT_R_SCT_FUTURE_TIMESTAMP 116
|
504
519
|
# define CT_R_SCT_INVALID 104
|
505
520
|
# define CT_R_SCT_INVALID_SIGNATURE 107
|
506
521
|
# define CT_R_SCT_LIST_INVALID 105
|
@@ -87,12 +87,29 @@ DECLARE_ASN1_ITEM(DHparams)
|
|
87
87
|
*/
|
88
88
|
# define DH_CHECK_P_NOT_STRONG_PRIME DH_CHECK_P_NOT_SAFE_PRIME
|
89
89
|
|
90
|
-
# define d2i_DHparams_fp(fp,x)
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
# define
|
90
|
+
# define d2i_DHparams_fp(fp,x) \
|
91
|
+
(DH *)ASN1_d2i_fp((char *(*)())DH_new, \
|
92
|
+
(char *(*)())d2i_DHparams, \
|
93
|
+
(fp), \
|
94
|
+
(unsigned char **)(x))
|
95
|
+
# define i2d_DHparams_fp(fp,x) \
|
96
|
+
ASN1_i2d_fp(i2d_DHparams,(fp), (unsigned char *)(x))
|
97
|
+
# define d2i_DHparams_bio(bp,x) \
|
98
|
+
ASN1_d2i_bio_of(DH, DH_new, d2i_DHparams, bp, x)
|
99
|
+
# define i2d_DHparams_bio(bp,x) \
|
100
|
+
ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x)
|
101
|
+
|
102
|
+
# define d2i_DHxparams_fp(fp,x) \
|
103
|
+
(DH *)ASN1_d2i_fp((char *(*)())DH_new, \
|
104
|
+
(char *(*)())d2i_DHxparams, \
|
105
|
+
(fp), \
|
106
|
+
(unsigned char **)(x))
|
107
|
+
# define i2d_DHxparams_fp(fp,x) \
|
108
|
+
ASN1_i2d_fp(i2d_DHxparams,(fp), (unsigned char *)(x))
|
109
|
+
# define d2i_DHxparams_bio(bp,x) \
|
110
|
+
ASN1_d2i_bio_of(DH, DH_new, d2i_DHxparams, bp, x)
|
111
|
+
# define i2d_DHxparams_bio(bp,x) \
|
112
|
+
ASN1_i2d_bio_of_const(DH, i2d_DHxparams, bp, x)
|
96
113
|
|
97
114
|
DH *DHparams_dup(DH *);
|
98
115
|
|
@@ -124,6 +141,7 @@ DEPRECATEDIN_0_9_8(DH *DH_generate_parameters(int prime_len, int generator,
|
|
124
141
|
int DH_generate_parameters_ex(DH *dh, int prime_len, int generator,
|
125
142
|
BN_GENCB *cb);
|
126
143
|
|
144
|
+
int DH_check_params(const DH *dh, int *ret);
|
127
145
|
int DH_check(const DH *dh, int *codes);
|
128
146
|
int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *codes);
|
129
147
|
int DH_generate_key(DH *dh);
|
@@ -212,9 +212,9 @@ extern "C" {
|
|
212
212
|
# endif
|
213
213
|
# endif
|
214
214
|
|
215
|
-
# if defined(OPENSSL_SYS_UEFI) && !defined(
|
216
|
-
# define ossl_ssize_t
|
217
|
-
# define OSSL_SSIZE_MAX
|
215
|
+
# if defined(OPENSSL_SYS_UEFI) && !defined(ossl_ssize_t)
|
216
|
+
# define ossl_ssize_t INTN
|
217
|
+
# define OSSL_SSIZE_MAX MAX_INTN
|
218
218
|
# endif
|
219
219
|
|
220
220
|
# ifndef ossl_ssize_t
|
@@ -242,7 +242,6 @@ typedef INT32 int32_t;
|
|
242
242
|
typedef UINT32 uint32_t;
|
243
243
|
typedef INT64 int64_t;
|
244
244
|
typedef UINT64 uint64_t;
|
245
|
-
# define PRIu64 "%Lu"
|
246
245
|
# elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
|
247
246
|
defined(__osf__) || defined(__sgi) || defined(__hpux) || \
|
248
247
|
defined(OPENSSL_SYS_VMS) || defined (__OpenBSD__)
|
@@ -264,18 +263,6 @@ typedef unsigned __int64 uint64_t;
|
|
264
263
|
# include <stdint.h>
|
265
264
|
# endif
|
266
265
|
|
267
|
-
/*
|
268
|
-
* We need a format operator for some client tools for uint64_t. If inttypes.h
|
269
|
-
* isn't available or did not define it, just go with hard-coded.
|
270
|
-
*/
|
271
|
-
# ifndef PRIu64
|
272
|
-
# ifdef SIXTY_FOUR_BIT_LONG
|
273
|
-
# define PRIu64 "lu"
|
274
|
-
# else
|
275
|
-
# define PRIu64 "llu"
|
276
|
-
# endif
|
277
|
-
# endif
|
278
|
-
|
279
266
|
/* ossl_inline: portable inline definition usable in public headers */
|
280
267
|
# if !defined(inline) && !defined(__cplusplus)
|
281
268
|
# if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
|
@@ -573,11 +573,9 @@ int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *p,
|
|
573
573
|
* \param point EC_POINT object
|
574
574
|
* \param form point conversion form
|
575
575
|
* \param pbuf returns pointer to allocated buffer
|
576
|
-
* \param len length of the memory buffer
|
577
576
|
* \param ctx BN_CTX object (optional)
|
578
577
|
* \return the length of the encoded octet string or 0 if an error occurred
|
579
578
|
*/
|
580
|
-
|
581
579
|
size_t EC_POINT_point2buf(const EC_GROUP *group, const EC_POINT *point,
|
582
580
|
point_conversion_form_t form,
|
583
581
|
unsigned char **pbuf, BN_CTX *ctx);
|
@@ -863,7 +861,7 @@ int EC_KEY_generate_key(EC_KEY *key);
|
|
863
861
|
int EC_KEY_check_key(const EC_KEY *key);
|
864
862
|
|
865
863
|
/** Indicates if an EC_KEY can be used for signing.
|
866
|
-
* \param
|
864
|
+
* \param eckey the EC_KEY object
|
867
865
|
* \return 1 if can can sign and 0 otherwise.
|
868
866
|
*/
|
869
867
|
int EC_KEY_can_sign(const EC_KEY *eckey);
|
@@ -882,11 +880,9 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
|
|
882
880
|
* \param key key to encode
|
883
881
|
* \param form point conversion form
|
884
882
|
* \param pbuf returns pointer to allocated buffer
|
885
|
-
* \param len length of the memory buffer
|
886
883
|
* \param ctx BN_CTX object (optional)
|
887
884
|
* \return the length of the encoded octet string or 0 if an error occurred
|
888
885
|
*/
|
889
|
-
|
890
886
|
size_t EC_KEY_key2buf(const EC_KEY *key, point_conversion_form_t form,
|
891
887
|
unsigned char **pbuf, BN_CTX *ctx);
|
892
888
|
|
@@ -921,11 +917,10 @@ int EC_KEY_oct2priv(EC_KEY *key, const unsigned char *buf, size_t len);
|
|
921
917
|
size_t EC_KEY_priv2oct(const EC_KEY *key, unsigned char *buf, size_t len);
|
922
918
|
|
923
919
|
/** Encodes an EC_KEY private key to an allocated octet string
|
924
|
-
* \param key
|
920
|
+
* \param eckey key to encode
|
925
921
|
* \param pbuf returns pointer to allocated buffer
|
926
922
|
* \return the length of the encoded octet string or 0 if an error occurred
|
927
923
|
*/
|
928
|
-
|
929
924
|
size_t EC_KEY_priv2buf(const EC_KEY *eckey, unsigned char **pbuf);
|
930
925
|
|
931
926
|
/********************************************************************/
|
@@ -1228,7 +1223,7 @@ void EC_KEY_METHOD_set_verify(EC_KEY_METHOD *meth,
|
|
1228
1223
|
const ECDSA_SIG *sig,
|
1229
1224
|
EC_KEY *eckey));
|
1230
1225
|
|
1231
|
-
void EC_KEY_METHOD_get_init(EC_KEY_METHOD *meth,
|
1226
|
+
void EC_KEY_METHOD_get_init(const EC_KEY_METHOD *meth,
|
1232
1227
|
int (**pinit)(EC_KEY *key),
|
1233
1228
|
void (**pfinish)(EC_KEY *key),
|
1234
1229
|
int (**pcopy)(EC_KEY *dest, const EC_KEY *src),
|
@@ -1239,16 +1234,16 @@ void EC_KEY_METHOD_get_init(EC_KEY_METHOD *meth,
|
|
1239
1234
|
int (**pset_public)(EC_KEY *key,
|
1240
1235
|
const EC_POINT *pub_key));
|
1241
1236
|
|
1242
|
-
void EC_KEY_METHOD_get_keygen(EC_KEY_METHOD *meth,
|
1237
|
+
void EC_KEY_METHOD_get_keygen(const EC_KEY_METHOD *meth,
|
1243
1238
|
int (**pkeygen)(EC_KEY *key));
|
1244
1239
|
|
1245
|
-
void EC_KEY_METHOD_get_compute_key(EC_KEY_METHOD *meth,
|
1240
|
+
void EC_KEY_METHOD_get_compute_key(const EC_KEY_METHOD *meth,
|
1246
1241
|
int (**pck)(unsigned char **psec,
|
1247
1242
|
size_t *pseclen,
|
1248
1243
|
const EC_POINT *pub_key,
|
1249
1244
|
const EC_KEY *ecdh));
|
1250
1245
|
|
1251
|
-
void EC_KEY_METHOD_get_sign(EC_KEY_METHOD *meth,
|
1246
|
+
void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
|
1252
1247
|
int (**psign)(int type, const unsigned char *dgst,
|
1253
1248
|
int dlen, unsigned char *sig,
|
1254
1249
|
unsigned int *siglen,
|
@@ -1262,7 +1257,7 @@ void EC_KEY_METHOD_get_sign(EC_KEY_METHOD *meth,
|
|
1262
1257
|
const BIGNUM *in_r,
|
1263
1258
|
EC_KEY *eckey));
|
1264
1259
|
|
1265
|
-
void EC_KEY_METHOD_get_verify(EC_KEY_METHOD *meth,
|
1260
|
+
void EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth,
|
1266
1261
|
int (**pverify)(int type, const unsigned
|
1267
1262
|
char *dgst, int dgst_len,
|
1268
1263
|
const unsigned char *sigbuf,
|
@@ -334,8 +334,6 @@ ENGINE *ENGINE_by_id(const char *id);
|
|
334
334
|
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_PADLOCK, NULL)
|
335
335
|
# define ENGINE_load_capi() \
|
336
336
|
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CAPI, NULL)
|
337
|
-
# define ENGINE_load_dasync() \
|
338
|
-
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DASYNC, NULL)
|
339
337
|
# define ENGINE_load_afalg() \
|
340
338
|
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL)
|
341
339
|
# endif
|
@@ -89,7 +89,7 @@ typedef struct err_state_st {
|
|
89
89
|
# define ERR_LIB_CMS 46
|
90
90
|
# define ERR_LIB_TS 47
|
91
91
|
# define ERR_LIB_HMAC 48
|
92
|
-
# define ERR_LIB_JPAKE
|
92
|
+
/* # define ERR_LIB_JPAKE 49 */
|
93
93
|
# define ERR_LIB_CT 50
|
94
94
|
# define ERR_LIB_ASYNC 51
|
95
95
|
# define ERR_LIB_KDF 52
|
@@ -128,7 +128,6 @@ typedef struct err_state_st {
|
|
128
128
|
# define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
|
129
129
|
# define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
|
130
130
|
# define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
|
131
|
-
# define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
|
132
131
|
# define CTerr(f,r) ERR_PUT_error(ERR_LIB_CT,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
|
133
132
|
# define ASYNCerr(f,r) ERR_PUT_error(ERR_LIB_ASYNC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
|
134
133
|
# define KDFerr(f,r) ERR_PUT_error(ERR_LIB_KDF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
|
@@ -140,6 +139,7 @@ typedef struct err_state_st {
|
|
140
139
|
# define ERR_GET_LIB(l) (int)(((l) >> 24L) & 0x0FFL)
|
141
140
|
# define ERR_GET_FUNC(l) (int)(((l) >> 12L) & 0xFFFL)
|
142
141
|
# define ERR_GET_REASON(l) (int)( (l) & 0xFFFL)
|
142
|
+
# define ERR_FATAL_ERROR(l) (int)( (l) & ERR_R_FATAL)
|
143
143
|
|
144
144
|
/* OS functions */
|
145
145
|
# define SYS_F_FOPEN 1
|
@@ -159,6 +159,7 @@ typedef struct err_state_st {
|
|
159
159
|
# define SYS_F_GETSOCKOPT 15
|
160
160
|
# define SYS_F_GETSOCKNAME 16
|
161
161
|
# define SYS_F_GETHOSTBYNAME 17
|
162
|
+
# define SYS_F_FFLUSH 18
|
162
163
|
|
163
164
|
/* reasons */
|
164
165
|
# define ERR_R_SYS_LIB ERR_LIB_SYS/* 2 */
|
@@ -900,6 +900,9 @@ int EVP_PKEY_security_bits(const EVP_PKEY *pkey);
|
|
900
900
|
int EVP_PKEY_size(EVP_PKEY *pkey);
|
901
901
|
int EVP_PKEY_set_type(EVP_PKEY *pkey, int type);
|
902
902
|
int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len);
|
903
|
+
# ifndef OPENSSL_NO_ENGINE
|
904
|
+
int EVP_PKEY_set1_engine(EVP_PKEY *pkey, ENGINE *e);
|
905
|
+
# endif
|
903
906
|
int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key);
|
904
907
|
void *EVP_PKEY_get0(const EVP_PKEY *pkey);
|
905
908
|
const unsigned char *EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len);
|
@@ -1455,11 +1458,14 @@ int ERR_load_EVP_strings(void);
|
|
1455
1458
|
/* Function codes. */
|
1456
1459
|
# define EVP_F_AESNI_INIT_KEY 165
|
1457
1460
|
# define EVP_F_AES_INIT_KEY 133
|
1461
|
+
# define EVP_F_AES_OCB_CIPHER 169
|
1458
1462
|
# define EVP_F_AES_T4_INIT_KEY 178
|
1463
|
+
# define EVP_F_AES_WRAP_CIPHER 170
|
1459
1464
|
# define EVP_F_ALG_MODULE_INIT 177
|
1460
1465
|
# define EVP_F_CAMELLIA_INIT_KEY 159
|
1461
1466
|
# define EVP_F_CHACHA20_POLY1305_CTRL 182
|
1462
1467
|
# define EVP_F_CMLL_T4_INIT_KEY 179
|
1468
|
+
# define EVP_F_DES_EDE3_WRAP_CIPHER 171
|
1463
1469
|
# define EVP_F_DO_SIGVER_INIT 161
|
1464
1470
|
# define EVP_F_EVP_CIPHERINIT_EX 123
|
1465
1471
|
# define EVP_F_EVP_CIPHER_CTX_COPY 163
|
@@ -1479,6 +1485,7 @@ int ERR_load_EVP_strings(void);
|
|
1479
1485
|
# define EVP_F_EVP_PBE_SCRYPT 181
|
1480
1486
|
# define EVP_F_EVP_PKCS82PKEY 111
|
1481
1487
|
# define EVP_F_EVP_PKEY2PKCS8 113
|
1488
|
+
# define EVP_F_EVP_PKEY_ASN1_ADD0 168
|
1482
1489
|
# define EVP_F_EVP_PKEY_COPY_PARAMETERS 103
|
1483
1490
|
# define EVP_F_EVP_PKEY_CTX_CTRL 137
|
1484
1491
|
# define EVP_F_EVP_PKEY_CTX_CTRL_STR 150
|
@@ -1502,6 +1509,7 @@ int ERR_load_EVP_strings(void);
|
|
1502
1509
|
# define EVP_F_EVP_PKEY_NEW 106
|
1503
1510
|
# define EVP_F_EVP_PKEY_PARAMGEN 148
|
1504
1511
|
# define EVP_F_EVP_PKEY_PARAMGEN_INIT 149
|
1512
|
+
# define EVP_F_EVP_PKEY_SET1_ENGINE 187
|
1505
1513
|
# define EVP_F_EVP_PKEY_SIGN 140
|
1506
1514
|
# define EVP_F_EVP_PKEY_SIGN_INIT 141
|
1507
1515
|
# define EVP_F_EVP_PKEY_VERIFY 142
|
@@ -1546,6 +1554,7 @@ int ERR_load_EVP_strings(void);
|
|
1546
1554
|
# define EVP_R_INPUT_NOT_INITIALIZED 111
|
1547
1555
|
# define EVP_R_INVALID_DIGEST 152
|
1548
1556
|
# define EVP_R_INVALID_FIPS_MODE 168
|
1557
|
+
# define EVP_R_INVALID_KEY 163
|
1549
1558
|
# define EVP_R_INVALID_KEY_LENGTH 130
|
1550
1559
|
# define EVP_R_INVALID_OPERATION 148
|
1551
1560
|
# define EVP_R_KEYGEN_FAILURE 120
|
@@ -1561,6 +1570,7 @@ int ERR_load_EVP_strings(void);
|
|
1561
1570
|
# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150
|
1562
1571
|
# define EVP_R_OPERATON_NOT_INITIALIZED 151
|
1563
1572
|
# define EVP_R_PARTIALLY_OVERLAPPING 162
|
1573
|
+
# define EVP_R_PKEY_ASN1_METHOD_ALREADY_REGISTERED 164
|
1564
1574
|
# define EVP_R_PRIVATE_KEY_DECODE_ERROR 145
|
1565
1575
|
# define EVP_R_PRIVATE_KEY_ENCODE_ERROR 146
|
1566
1576
|
# define EVP_R_PUBLIC_KEY_NOT_RSA 106
|
@@ -1568,12 +1578,12 @@ int ERR_load_EVP_strings(void);
|
|
1568
1578
|
# define EVP_R_UNKNOWN_DIGEST 161
|
1569
1579
|
# define EVP_R_UNKNOWN_OPTION 169
|
1570
1580
|
# define EVP_R_UNKNOWN_PBE_ALGORITHM 121
|
1571
|
-
# define EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS 135
|
1572
1581
|
# define EVP_R_UNSUPPORTED_ALGORITHM 156
|
1573
1582
|
# define EVP_R_UNSUPPORTED_CIPHER 107
|
1574
1583
|
# define EVP_R_UNSUPPORTED_KEYLENGTH 123
|
1575
1584
|
# define EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION 124
|
1576
1585
|
# define EVP_R_UNSUPPORTED_KEY_SIZE 108
|
1586
|
+
# define EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS 135
|
1577
1587
|
# define EVP_R_UNSUPPORTED_PRF 125
|
1578
1588
|
# define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM 118
|
1579
1589
|
# define EVP_R_UNSUPPORTED_SALT_TYPE 126
|
@@ -195,8 +195,21 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
|
|
195
195
|
LHASH_OF(type)
|
196
196
|
|
197
197
|
DEFINE_LHASH_OF(OPENSSL_STRING);
|
198
|
+
# ifdef _MSC_VER
|
199
|
+
/*
|
200
|
+
* push and pop this warning:
|
201
|
+
* warning C4090: 'function': different 'const' qualifiers
|
202
|
+
*/
|
203
|
+
# pragma warning (push)
|
204
|
+
# pragma warning (disable: 4090)
|
205
|
+
# endif
|
206
|
+
|
198
207
|
DEFINE_LHASH_OF(OPENSSL_CSTRING);
|
199
208
|
|
209
|
+
# ifdef _MSC_VER
|
210
|
+
# pragma warning (pop)
|
211
|
+
# endif
|
212
|
+
|
200
213
|
#ifdef __cplusplus
|
201
214
|
}
|
202
215
|
#endif
|
@@ -992,7 +992,7 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base, int num,
|
|
992
992
|
* const void *a_;
|
993
993
|
* const nid_triple const *a = a_;
|
994
994
|
*
|
995
|
-
* The
|
995
|
+
* The assignment discards a const because what you really want is:
|
996
996
|
*
|
997
997
|
* const int const * const *a = a_;
|
998
998
|
*
|
@@ -1000,7 +1000,7 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base, int num,
|
|
1000
1000
|
* which breaks comparison functions.
|
1001
1001
|
*
|
1002
1002
|
* Thus we end up having to cast, sadly, or unpack the
|
1003
|
-
* declarations. Or, as I finally did in this case,
|
1003
|
+
* declarations. Or, as I finally did in this case, declare nid_triple
|
1004
1004
|
* to be a struct, which it should have been in the first place.
|
1005
1005
|
*
|
1006
1006
|
* Ben, August 2008.
|
@@ -137,22 +137,6 @@ typedef struct ocsp_service_locator_st OCSP_SERVICELOC;
|
|
137
137
|
|
138
138
|
# define i2d_OCSP_REQUEST_bio(bp,o) ASN1_i2d_bio_of(OCSP_REQUEST,i2d_OCSP_REQUEST,bp,o)
|
139
139
|
|
140
|
-
# define OCSP_REQUEST_sign(o,pkey,md) \
|
141
|
-
ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO),\
|
142
|
-
&o->optionalSignature->signatureAlgorithm,NULL,\
|
143
|
-
o->optionalSignature->signature,&o->tbsRequest,pkey,md)
|
144
|
-
|
145
|
-
# define OCSP_BASICRESP_sign(o,pkey,md,d) \
|
146
|
-
ASN1_item_sign(ASN1_ITEM_rptr(OCSP_RESPDATA),&o->signatureAlgorithm,NULL,\
|
147
|
-
o->signature,&o->tbsResponseData,pkey,md)
|
148
|
-
|
149
|
-
# define OCSP_REQUEST_verify(a,r) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_REQINFO),\
|
150
|
-
&a->optionalSignature->signatureAlgorithm,\
|
151
|
-
a->optionalSignature->signature,&a->tbsRequest,r)
|
152
|
-
|
153
|
-
# define OCSP_BASICRESP_verify(a,r,d) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_RESPDATA),\
|
154
|
-
&a->signatureAlgorithm,a->signature,&a->tbsResponseData,r)
|
155
|
-
|
156
140
|
# define ASN1_BIT_STRING_digest(data,type,md,len) \
|
157
141
|
ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len)
|
158
142
|
|
@@ -259,6 +243,9 @@ int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert);
|
|
259
243
|
int OCSP_basic_sign(OCSP_BASICRESP *brsp,
|
260
244
|
X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
|
261
245
|
STACK_OF(X509) *certs, unsigned long flags);
|
246
|
+
int OCSP_RESPID_set_by_name(OCSP_RESPID *respid, X509 *cert);
|
247
|
+
int OCSP_RESPID_set_by_key(OCSP_RESPID *respid, X509 *cert);
|
248
|
+
int OCSP_RESPID_match(OCSP_RESPID *respid, X509 *cert);
|
262
249
|
|
263
250
|
X509_EXTENSION *OCSP_crlID_new(const char *url, long *n, char *tim);
|
264
251
|
|