Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
587922e6
Commit
587922e6
authored
Apr 05, 2000
by
Brian Wellington
Browse files
converting from KEY records to dsa keys was broken.
parent
b8fd630c
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/dns/sec/dst/openssl_link.c
View file @
587922e6
...
...
@@ -19,7 +19,7 @@
/*
* Principal Author: Brian Wellington
* $Id: openssl_link.c,v 1.1
4
2000/0
3
/0
7 19
:2
7
:5
0
bwelling Exp $
* $Id: openssl_link.c,v 1.1
5
2000/0
4
/0
5 22
:2
2
:5
1
bwelling Exp $
*/
#include
<config.h>
...
...
@@ -272,7 +272,7 @@ dst_openssl_to_dns(const dst_key_t *key, isc_buffer_t *data) {
DSA
*
dsa
;
isc_region_t
r
;
int
dnslen
;
unsigned
int
t
;
unsigned
int
t
,
p_bytes
;
REQUIRE
(
key
->
opaque
!=
NULL
);
...
...
@@ -283,6 +283,7 @@ dst_openssl_to_dns(const dst_key_t *key, isc_buffer_t *data) {
t
=
(
BN_num_bytes
(
dsa
->
p
)
-
64
)
/
8
;
if
(
t
>
8
)
return
(
DST_R_INVALIDPUBLICKEY
);
p_bytes
=
64
+
8
*
t
;
dnslen
=
1
+
(
key
->
key_size
*
3
)
/
8
+
SHA_DIGEST_LENGTH
;
if
(
r
.
length
<
(
unsigned
int
)
dnslen
)
...
...
@@ -292,11 +293,11 @@ dst_openssl_to_dns(const dst_key_t *key, isc_buffer_t *data) {
BN_bn2bin_fixed
(
dsa
->
q
,
r
.
base
,
SHA_DIGEST_LENGTH
);
r
.
base
+=
SHA_DIGEST_LENGTH
;
BN_bn2bin_fixed
(
dsa
->
p
,
r
.
base
,
key
->
key_size
/
8
);
r
.
base
+=
key
->
key_size
/
8
;
r
.
base
+=
p_bytes
;
BN_bn2bin_fixed
(
dsa
->
g
,
r
.
base
,
key
->
key_size
/
8
);
r
.
base
+=
key
->
key_size
/
8
;
r
.
base
+=
p_bytes
;
BN_bn2bin_fixed
(
dsa
->
pub_key
,
r
.
base
,
key
->
key_size
/
8
);
r
.
base
+=
key
->
key_size
/
8
;
r
.
base
+=
p_bytes
;
isc_buffer_add
(
data
,
dnslen
);
...
...
@@ -327,7 +328,6 @@ dst_openssl_from_dns(dst_key_t *key, isc_buffer_t *data, isc_mem_t *mctx) {
return
(
ISC_R_SUCCESS
);
dsa
=
DSA_new
();
/* dsa = (DSA *) isc_mem_get(mctx, sizeof(DSA));*/
if
(
dsa
==
NULL
)
return
(
ISC_R_NOMEMORY
);
...
...
@@ -347,20 +347,20 @@ dst_openssl_from_dns(dst_key_t *key, isc_buffer_t *data, isc_mem_t *mctx) {
r
.
base
+=
SHA_DIGEST_LENGTH
;
dsa
->
p
=
BN_bin2bn
(
r
.
base
,
p_bytes
,
NULL
);
r
.
base
+=
SHA_DIGEST_LENGTH
;
r
.
base
+=
p_bytes
;
dsa
->
g
=
BN_bin2bn
(
r
.
base
,
p_bytes
,
NULL
);
r
.
base
+=
SHA_DIGEST_LENGTH
;
r
.
base
+=
p_bytes
;
dsa
->
pub_key
=
BN_bin2bn
(
r
.
base
,
p_bytes
,
NULL
);
r
.
base
+=
SHA_DIGEST_LENGTH
;
r
.
base
+=
p_bytes
;
isc_buffer_remaining
(
data
,
&
r
);
key
->
key_id
=
dst_s_id_calc
(
r
.
base
,
1
+
SHA_DIGEST_LENGTH
+
3
*
p_bytes
);
key
->
key_size
=
p_bytes
*
8
;
isc_buffer_forward
(
data
,
SHA_DIGEST_LENGTH
+
3
*
p_bytes
);
isc_buffer_forward
(
data
,
1
+
SHA_DIGEST_LENGTH
+
3
*
p_bytes
);
key
->
opaque
=
(
void
*
)
dsa
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment