diff options
author | Colin Watson <cjwatson@debian.org> | 2010-08-23 22:56:08 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-08-23 22:56:08 +0100 |
commit | 31e30b835fd9695d3b6647cab4867001b092e28f (patch) | |
tree | 138e715c25661825457c7280cd66e3f4853d474c /authfd.c | |
parent | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (diff) | |
parent | 43094ebf14c9b16f1ea398bc5b65a7335e947288 (diff) |
merge 5.6p1
Diffstat (limited to 'authfd.c')
-rw-r--r-- | authfd.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfd.c,v 1.82 2010/02/26 20:29:54 djm Exp $ */ | 1 | /* $OpenBSD: authfd.c,v 1.83 2010/04/16 01:47:26 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -483,6 +483,7 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment) | |||
483 | buffer_put_bignum2(b, key->rsa->p); | 483 | buffer_put_bignum2(b, key->rsa->p); |
484 | buffer_put_bignum2(b, key->rsa->q); | 484 | buffer_put_bignum2(b, key->rsa->q); |
485 | break; | 485 | break; |
486 | case KEY_RSA_CERT_V00: | ||
486 | case KEY_RSA_CERT: | 487 | case KEY_RSA_CERT: |
487 | if (key->cert == NULL || buffer_len(&key->cert->certblob) == 0) | 488 | if (key->cert == NULL || buffer_len(&key->cert->certblob) == 0) |
488 | fatal("%s: no cert/certblob", __func__); | 489 | fatal("%s: no cert/certblob", __func__); |
@@ -500,6 +501,7 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment) | |||
500 | buffer_put_bignum2(b, key->dsa->pub_key); | 501 | buffer_put_bignum2(b, key->dsa->pub_key); |
501 | buffer_put_bignum2(b, key->dsa->priv_key); | 502 | buffer_put_bignum2(b, key->dsa->priv_key); |
502 | break; | 503 | break; |
504 | case KEY_DSA_CERT_V00: | ||
503 | case KEY_DSA_CERT: | 505 | case KEY_DSA_CERT: |
504 | if (key->cert == NULL || buffer_len(&key->cert->certblob) == 0) | 506 | if (key->cert == NULL || buffer_len(&key->cert->certblob) == 0) |
505 | fatal("%s: no cert/certblob", __func__); | 507 | fatal("%s: no cert/certblob", __func__); |
@@ -535,8 +537,10 @@ ssh_add_identity_constrained(AuthenticationConnection *auth, Key *key, | |||
535 | break; | 537 | break; |
536 | case KEY_RSA: | 538 | case KEY_RSA: |
537 | case KEY_RSA_CERT: | 539 | case KEY_RSA_CERT: |
540 | case KEY_RSA_CERT_V00: | ||
538 | case KEY_DSA: | 541 | case KEY_DSA: |
539 | case KEY_DSA_CERT: | 542 | case KEY_DSA_CERT: |
543 | case KEY_DSA_CERT_V00: | ||
540 | type = constrained ? | 544 | type = constrained ? |
541 | SSH2_AGENTC_ADD_ID_CONSTRAINED : | 545 | SSH2_AGENTC_ADD_ID_CONSTRAINED : |
542 | SSH2_AGENTC_ADD_IDENTITY; | 546 | SSH2_AGENTC_ADD_IDENTITY; |