diff options
| author | David Shaw <[email protected]> | 2002-11-02 21:39:37 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-11-02 21:39:37 +0000 |
| commit | d6693c144c19e0f29114d7e121c549a6e2079798 (patch) | |
| tree | af3e124b449ceeb83e576a6393c7b4c1d1297a4c /cipher/cipher.c | |
| parent | * g10.c (main): Add --no-throw-keyid. (diff) | |
| download | gnupg-d6693c144c19e0f29114d7e121c549a6e2079798.tar.gz gnupg-d6693c144c19e0f29114d7e121c549a6e2079798.zip | |
* cipher.c (string_to_cipher_algo), md.c (string_to_digest_algo): Allow
the Sxxx and Hxxx format for cipher and digest names.
Diffstat (limited to 'cipher/cipher.c')
| -rw-r--r-- | cipher/cipher.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/cipher/cipher.c b/cipher/cipher.c index 9a774cf85..4bbef9377 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -211,12 +211,6 @@ load_cipher_modules(void) return 0; } - - - - - - /**************** * Map a string to the cipher algo */ @@ -245,6 +239,20 @@ string_to_cipher_algo( const char *string ) return cipher_table[i].algo; } } while( load_cipher_modules() ); + + /* Didn't find it, so try the Sx format */ + if(string[0]=='S' || string[0]=='s') + { + long val; + char *endptr; + + string++; + + val=strtol(string,&endptr,10); + if(*string!='\0' && *endptr=='\0' && check_cipher_algo(val)==0) + return val; + } + return 0; } @@ -675,4 +683,3 @@ cipher_sync( CIPHER_HANDLE c ) c->unused = 0; } } - |