projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in CONTRIBUTING.md
[openssl.git]
/
crypto
/
asn1
/
x_int64.c
diff --git
a/crypto/asn1/x_int64.c
b/crypto/asn1/x_int64.c
index 657e00d723234068861759e422a302e6072dbfb2..b7251b8ad8b640c84fe0e790613a7e2b0084fb96 100644
(file)
--- a/
crypto/asn1/x_int64.c
+++ b/
crypto/asn1/x_int64.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2017-20
18
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-20
21
The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-12,7
+12,7
@@
#include "internal/numbers.h"
#include <openssl/asn1t.h>
#include <openssl/bn.h>
#include "internal/numbers.h"
#include <openssl/asn1t.h>
#include <openssl/bn.h>
-#include "asn1_locl.h"
+#include "asn1_loc
a
l.h"
/*
* Custom primitive types for handling int32_t, int64_t, uint32_t, uint64_t.
/*
* Custom primitive types for handling int32_t, int64_t, uint32_t, uint64_t.
@@
-28,10
+28,8
@@
static int uint64_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
{
static int uint64_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
{
- if ((*pval = (ASN1_VALUE *)OPENSSL_zalloc(sizeof(uint64_t))) == NULL) {
- ASN1err(ASN1_F_UINT64_NEW, ERR_R_MALLOC_FAILURE);
+ if ((*pval = (ASN1_VALUE *)OPENSSL_zalloc(sizeof(uint64_t))) == NULL)
return 0;
return 0;
- }
return 1;
}
return 1;
}
@@
-46,8
+44,8
@@
static void uint64_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
**(uint64_t **)pval = 0;
}
**(uint64_t **)pval = 0;
}
-static int uint64_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
- const ASN1_ITEM *it)
+static int uint64_i2c(
const
ASN1_VALUE **pval, unsigned char *cont, int *putype,
+
const ASN1_ITEM *it)
{
uint64_t utmp;
int neg = 0;
{
uint64_t utmp;
int neg = 0;
@@
-62,16
+60,16
@@
static int uint64_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
return -1;
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED
&& (int64_t)utmp < 0) {
return -1;
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED
&& (int64_t)utmp < 0) {
- /* i2c_uint64_int() assumes positive values */
+ /*
ossl_
i2c_uint64_int() assumes positive values */
utmp = 0 - utmp;
neg = 1;
}
utmp = 0 - utmp;
neg = 1;
}
- return i2c_uint64_int(cont, utmp, neg);
+ return
ossl_
i2c_uint64_int(cont, utmp, neg);
}
static int uint64_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
}
static int uint64_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
- int utype, char *free_cont, const ASN1_ITEM *it)
+
int utype, char *free_cont, const ASN1_ITEM *it)
{
uint64_t utmp = 0;
char *cp;
{
uint64_t utmp = 0;
char *cp;
@@
-91,19
+89,19
@@
static int uint64_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
if (len == 0)
goto long_compat;
if (len == 0)
goto long_compat;
- if (!c2i_uint64_int(&utmp, &neg, &cont, len))
+ if (!
ossl_
c2i_uint64_int(&utmp, &neg, &cont, len))
return 0;
if ((it->size & INTxx_FLAG_SIGNED) == 0 && neg) {
return 0;
if ((it->size & INTxx_FLAG_SIGNED) == 0 && neg) {
-
ASN1err(ASN1_F_UINT64_C2I
, ASN1_R_ILLEGAL_NEGATIVE_VALUE);
+
ERR_raise(ERR_LIB_ASN1
, ASN1_R_ILLEGAL_NEGATIVE_VALUE);
return 0;
}
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED
&& !neg && utmp > INT64_MAX) {
return 0;
}
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED
&& !neg && utmp > INT64_MAX) {
-
ASN1err(ASN1_F_UINT64_C2I
, ASN1_R_TOO_LARGE);
+
ERR_raise(ERR_LIB_ASN1
, ASN1_R_TOO_LARGE);
return 0;
}
if (neg)
return 0;
}
if (neg)
- /* c2i_uint64_int() returns positive values */
+ /*
ossl_
c2i_uint64_int() returns positive values */
utmp = 0 - utmp;
long_compat:
utmp = 0 - utmp;
long_compat:
@@
-111,7
+109,7
@@
static int uint64_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
return 1;
}
return 1;
}
-static int uint64_print(BIO *out, ASN1_VALUE **pval, const ASN1_ITEM *it,
+static int uint64_print(BIO *out,
const
ASN1_VALUE **pval, const ASN1_ITEM *it,
int indent, const ASN1_PCTX *pctx)
{
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED)
int indent, const ASN1_PCTX *pctx)
{
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED)
@@
-123,10
+121,8
@@
static int uint64_print(BIO *out, ASN1_VALUE **pval, const ASN1_ITEM *it,
static int uint32_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
{
static int uint32_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
{
- if ((*pval = (ASN1_VALUE *)OPENSSL_zalloc(sizeof(uint32_t))) == NULL) {
- ASN1err(ASN1_F_UINT32_NEW, ERR_R_MALLOC_FAILURE);
+ if ((*pval = (ASN1_VALUE *)OPENSSL_zalloc(sizeof(uint32_t))) == NULL)
return 0;
return 0;
- }
return 1;
}
return 1;
}
@@
-141,8
+137,8
@@
static void uint32_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
**(uint32_t **)pval = 0;
}
**(uint32_t **)pval = 0;
}
-static int uint32_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
- const ASN1_ITEM *it)
+static int uint32_i2c(
const
ASN1_VALUE **pval, unsigned char *cont, int *putype,
+
const ASN1_ITEM *it)
{
uint32_t utmp;
int neg = 0;
{
uint32_t utmp;
int neg = 0;
@@
-157,12
+153,12
@@
static int uint32_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
return -1;
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED
&& (int32_t)utmp < 0) {
return -1;
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED
&& (int32_t)utmp < 0) {
- /* i2c_uint64_int() assumes positive values */
+ /*
ossl_
i2c_uint64_int() assumes positive values */
utmp = 0 - utmp;
neg = 1;
}
utmp = 0 - utmp;
neg = 1;
}
- return i2c_uint64_int(cont, (uint64_t)utmp, neg);
+ return
ossl_
i2c_uint64_int(cont, (uint64_t)utmp, neg);
}
/*
}
/*
@@
-173,7
+169,7
@@
static int uint32_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
#define ABS_INT32_MIN ((uint32_t)INT32_MAX + 1)
static int uint32_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
#define ABS_INT32_MIN ((uint32_t)INT32_MAX + 1)
static int uint32_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
- int utype, char *free_cont, const ASN1_ITEM *it)
+
int utype, char *free_cont, const ASN1_ITEM *it)
{
uint64_t utmp = 0;
uint32_t utmp2 = 0;
{
uint64_t utmp = 0;
uint32_t utmp2 = 0;
@@
-194,22
+190,22
@@
static int uint32_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
if (len == 0)
goto long_compat;
if (len == 0)
goto long_compat;
- if (!c2i_uint64_int(&utmp, &neg, &cont, len))
+ if (!
ossl_
c2i_uint64_int(&utmp, &neg, &cont, len))
return 0;
if ((it->size & INTxx_FLAG_SIGNED) == 0 && neg) {
return 0;
if ((it->size & INTxx_FLAG_SIGNED) == 0 && neg) {
-
ASN1err(ASN1_F_UINT32_C2I
, ASN1_R_ILLEGAL_NEGATIVE_VALUE);
+
ERR_raise(ERR_LIB_ASN1
, ASN1_R_ILLEGAL_NEGATIVE_VALUE);
return 0;
}
if (neg) {
if (utmp > ABS_INT32_MIN) {
return 0;
}
if (neg) {
if (utmp > ABS_INT32_MIN) {
-
ASN1err(ASN1_F_UINT32_C2I
, ASN1_R_TOO_SMALL);
+
ERR_raise(ERR_LIB_ASN1
, ASN1_R_TOO_SMALL);
return 0;
}
utmp = 0 - utmp;
} else {
if (((it->size & INTxx_FLAG_SIGNED) != 0 && utmp > INT32_MAX)
|| ((it->size & INTxx_FLAG_SIGNED) == 0 && utmp > UINT32_MAX)) {
return 0;
}
utmp = 0 - utmp;
} else {
if (((it->size & INTxx_FLAG_SIGNED) != 0 && utmp > INT32_MAX)
|| ((it->size & INTxx_FLAG_SIGNED) == 0 && utmp > UINT32_MAX)) {
-
ASN1err(ASN1_F_UINT32_C2I
, ASN1_R_TOO_LARGE);
+
ERR_raise(ERR_LIB_ASN1
, ASN1_R_TOO_LARGE);
return 0;
}
}
return 0;
}
}
@@
-220,12
+216,12
@@
static int uint32_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
return 1;
}
return 1;
}
-static int uint32_print(BIO *out, ASN1_VALUE **pval, const ASN1_ITEM *it,
+static int uint32_print(BIO *out,
const
ASN1_VALUE **pval, const ASN1_ITEM *it,
int indent, const ASN1_PCTX *pctx)
{
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED)
int indent, const ASN1_PCTX *pctx)
{
if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED)
- return BIO_printf(out, "%d\n", **(int32_t **)pval);
- return BIO_printf(out, "%u\n", **(uint32_t **)pval);
+ return BIO_printf(out, "%d\n",
(int)
**(int32_t **)pval);
+ return BIO_printf(out, "%u\n",
(unsigned int)
**(uint32_t **)pval);
}
}